Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155
authorBryan <btbonval@gmail.com>
Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)
committerBryan <btbonval@gmail.com>
Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)

Trivial merge