Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)
committerCharles Holbrow <charlesholbrow@gmail.com>
Thu, 21 Mar 2013 21:34:14 +0000 (17:34 -0400)
1  2 
karmaworld/assets/css/global.css
karmaworld/templates/partial/add_note.html

Simple merge