not sure
Merge branch 'master' of https://github.com/jacknhudson/signschool

Conflicts:
	signschool/settings.py