Merge branch 'filepick.io' of ssh://github.com/FinalsClub/karmaworld into filepick.io
authorBryan Bonvallet <btbonval@gmail.com>
Fri, 13 Dec 2013 16:55:34 +0000 (11:55 -0500)
committerBryan Bonvallet <btbonval@gmail.com>
Fri, 13 Dec 2013 16:55:34 +0000 (11:55 -0500)

Trivial merge