Merge branch 'master' of github.com:FinalsClub/karmaworld
authorSeth Woodworth <seth@sethish.com>
Mon, 18 Mar 2013 21:32:39 +0000 (17:32 -0400)
committerSeth Woodworth <seth@sethish.com>
Mon, 18 Mar 2013 21:32:39 +0000 (17:32 -0400)
commit468f699889c39aeb05f329696498d39c2bc24f5f
tree2cee9b6aad0e7ae42d468b8dae30c79cacade082
parentf407d0e037711037c73798d47872345d107bf233
parent2f42eeabfd3a71a2cdbdb1475bc34bdeb80700cb
Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
karmaworld/assets/css/global.css
karmaworld/assets/css/global.css