Work on register
Merge branch 'master' of https://github.com/ClaremontAcademia/Forum
Merge branch 'master' of https://github.com/ClaremontAcademia/Forum

Conflicts:
	db.sqlite3