green
Merge branch 'master' of https://github.com/aikeqi/CET_WEB.git
修改register样式 --green
Merge branch 'master' of https://github.com/aikeqi/CET_WEB.git

Conflicts:
	WebContent/login.jsp
	WebContent/register.jsp