stuff
Merge branch 'master' of https://github.com/kar288/jcollege

Conflicts:
	app/views.py
	jcollege/static/js/whoisjack.js