jfda
Merge branch 'master' of https://github.com/simonvuong/336-project

Conflicts:
	WebContent/reg.jsp
	WebContent/registration.jsp