Encoding
encoding
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	0eqoci1a.410.txt
	WebContent/EmployeeEntry.jsp
	WebContent/login.jsp
	build/classes/.gitignore
Salary and SalaryDao
Add Salary Entity and Salary Dao.