todo
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/delete.html
	static/home.html
	static/insert.html
	static/photos/1.jpg
	static/query.html
	static/result.html
	static/update.html