Feedback package #1

Works, but not great
Fix stray comment
Merge branch 'master' into feedback
Merge branch 'master' of https://github.com/cknoll/codequiz-server

Conflicts:
	codequiz-server/codequiz/settings.py
	codequiz-server/codequiz/urls.py
	codequiz-server/codequiz_db_file