Merge branch 'master' of github.com:FinalsClub/karmaworld

diff --cc karmaworld/assets/css/global.css
Simple merge

diff --cc karmaworld/urls.py
index c085e28446ca1d62a467d90367749d681932457e,5587cb227517a9ea8ba3eff24b4d9463af6e7ee9..cde1cd4aa0aaf3fcdbe96c4e1fa612dd8592368d
--- 1/karmaworld/urls.py
--- 2/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -11,10 -11,10 +11,10 @@@ from karmaworld.apps.ajaxuploader.view
  from karmaworld.apps.courses.models import Course
  from karmaworld.apps.courses.views import AboutView
  from karmaworld.apps.courses.views import CourseDetailView
- from karmaworld.apps.courses.views import CourseSaveView
+ from karmaworld.apps.courses.views import CourseListView
  from karmaworld.apps.courses.views import school_list
  from karmaworld.apps.notes.views import NoteView
 -from karmaworld.apps.notes.views import raw_file
 +from karmaworld.apps.notes.views import RawNoteDetailView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
  admin.autodiscover()