Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Sat, 26 Jan 2013 01:12:01 +0000 (20:12 -0500)
committerCharles Holbrow <charlesholbrow@gmail.com>
Sat, 26 Jan 2013 01:12:01 +0000 (20:12 -0500)
commit4522cd8375041d823dd5f56961e080a371dca75b
tree608c86b840697b40c338c1c4d16a65303cb71940
parentea108dc2090cd417a957df526027eed1fe99892e
parent39092797e4df8bcd533cfaf9a02c85dfedc619a1
Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
karmaworld/templates/courses/course_list.html
karmaworld/assets/css/global.css
karmaworld/templates/courses/course_list.html