new file:   WebContent/MyHtml.html
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
checkLogin
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
	deleted:    WebContent/salaryComputeFormula.jsp.BASE.jsp
	deleted:    WebContent/salaryComputeFormula.jsp.LOCAL.jsp
	deleted:    WebContent/salaryComputeFormula.jsp.REMOTE.jsp
	modified:   .gitignore
	modified:   WebContent/Zengyuanqixin.jsp
	modified:   WebContent/userMain.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
	modified:   WebContent/userMain.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	src/config/applicationContext-common.xml
Test
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/DisplayEmployeeInfo.jsp
	WebContent/Querystatistics.jsp
	WebContent/login.jsp
	src/config/applicationContext-common.xml
	modified:   WebContent/ImportEmployeeInfo.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Querystatistics.jsp
	WebContent/login.jsp
	build/classes/config/struts-user.xml
	src/com/sms/action/LoginAction.java
	src/config/struts-user.xml
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Querystatistics.jsp
	WebContent/academictitlechange.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Querystatistics.jsp