a
Merge branch 'master' of https://github.com/haluomao/ClassificationInfoDemo

Conflicts:
	src/main/java/com/student/registration/controller/AccountController.java
	src/main/java/com/student/registration/controller/UserController.java
	src/main/webapp/WEB-INF/pages/images/background.png
	src/main/webapp/WEB-INF/pages/index.jsp
	src/main/webapp/WEB-INF/pages/login.jsp
	src/main/webapp/WEB-INF/pages/register.jsp