bulk update
Merge branch 'master' of https://github.com/blackshirt/webapt

Conflicts:
	srv.py
	static/css/style.css
	templates/base.html
add some images, and modified some files