test
Merge branch 'master' of https://github.com/dedenido/School-Registration-Web-App

Conflicts:
	WebContent/index.jsp