modified:   WebContent/Employee.jsp
	modified:   WebContent/userMain.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
	modified:   WebContent/js/jquery.js
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/left.jsp
	WebContent/top.jsp