Merge branch 'master' of https://github.com/almondg/cursejar

Conflicts:
	cursejar/core/views.py
	cursejar/cursejar/urls.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	cursejar/core/templates/core/base.html
	cursejar/core/templates/core/index.html
Merge branch 'master' of https://github.com/almondg/cursejar

Conflicts:
	cursejar/core/views.py
	cursejar/cursejar/urls.py