First commit
First commit
First commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/yijun/hie/controller/HomeController.java
	src/main/webapp/WEB-INF/jsp/viewAccount.jsp
First commit