hj
Merge branch 'master' of
ssh://git@github.com/NewCodington/CodingtonFinalProjectPortal.git

Conflicts:
	WebSpringCodingtonPortal/WebContent/error.jsp
hcv