forms
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/.settings/org.eclipse.core.resources.prefs
	CavalierWebApplication/WebContent/WEB-INF/jsp/applicant.jsp
	CavalierWebApplication/WebContent/WEB-INF/jsp/eduAndExpForm.jsp
	CavalierWebApplication/WebContent/WEB-INF/jsp/recruitmentForm.jsp
	CavalierWebApplication/WebContent/WEB-INF/jsp/skillForm.jsp
	CavalierWebApplication/src/com/cavalier/controlloers/ApplicantController.java
home
home
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/.settings/oracle.eclipse.tools.webtier.ui.prefs
	CavalierWebApplication/WebContent/WEB-INF/jsp/applicant.jsp
	CavalierWebApplication/src/com/cavalier/controlloers/ApplicantController.java
	CavalierWebApplication/src/com/cavalier/controlloers/HomeController.java
forms
commit
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/src/com/cavalier/controlloers/LoginController.java
Merge branch 'master' of https://github.com/chrisyly/CavalierWebApplication.git
merge
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/WebContent/WEB-INF/jsp/recruitmentForm.jsp
	CavalierWebApplication/src/com/cavalier/controlloers/ApplicantController.java
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/.settings/org.eclipse.core.resources.prefs
	CavalierWebApplication/WebContent/WEB-INF/jsp/home.jsp
	CavalierWebApplication/src/com/cavalier/controlloers/ApplicantController.java
forms
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/src/com/cavalier/ejb/RemoteEJB.java
	CavalierWebApplication/src/com/cavalier/ejb/UserEJB.java