Main Page
1.Learn to use Junit , jQuery and ajax
2.StartSalaryInfo Entity and Dao
Merge Conflicts:

	.classpath
	WebContent/DisplayEmployeeInfo.jsp
	build/classes/.gitignore
	build/classes/config/applicationContext-beans.xml
	build/classes/config/applicationContext-common.xml
	src/com/sms/dao/ISalaryDao.java
	src/com/sms/dao/impl/SalaryDaoImp.java
	src/com/sms/entity/Salary.java
	src/config/applicationContext-beans.xml
	src/config/applicationContext-common.xml
StartSalaryInfo