edit changes
Merge branch 'master' of https://github.com/fo211001/web_app

Conflicts:
	web_app/templates/edit.jinja2