errors when submitting form
Merge remote-tracking branch 'origin/master'

Conflicts:
	init_db.py
	templates/index.html