Register Participant for the conference
Merge branch 'master' of
https://github.com/sarvagyaj/cmpe273-project.git

Conflicts:
	src/main/webapp/WEB-INF/pages/ViewConference.jsp