Signed-off-by: Jimmy <gorljimmy@pku.edu.cn>
Merge branch 'master' of https://github.com/GorlJimmy/linux4pkuss

Conflicts:
	linux4pkuss/controller/user/userHandler.php
	linux4pkuss/templates/header_nav.tpl