I have no idea
Merge branch 'master' of github.com:mnbbrown/doneapp

Conflicts:
	app.py
	templates/preferences.html
	templates/register.html
Major move
Massive cleanup