html
Merge branch 'master' of https://github.com/wx6/tsinghuatuan

Conflicts:
	urlhandler/userpage/templates/vote_mainpage.html