Modify some files
Merge remote-tracking branch 'origin'

Conflicts:
	srv.py
	templates/view.html
add view function t