Merge branch 'filepick.io' of https://github.com/FinalsClub/karmaworld into fp.io
authorSeth Woodworth <seth@sethish.com>
Wed, 28 Aug 2013 21:51:17 +0000 (21:51 +0000)
committerSeth Woodworth <seth@sethish.com>
Wed, 28 Aug 2013 21:51:17 +0000 (21:51 +0000)

Trivial merge