edit template
Merge branch 'master' of github.com:tkido/tohobbs

Conflicts:
	server/main.py
	server/model.py