Merge branch 'master' of https://github.com/FinalsClub/karmaworld
authorwilliambratches <williambratches@gmail.com>
Tue, 4 Mar 2014 19:01:58 +0000 (14:01 -0500)
committerwilliambratches <williambratches@gmail.com>
Tue, 4 Mar 2014 19:01:58 +0000 (14:01 -0500)
1  2 
karmaworld/urls.py

Simple merge