Merge remote-tracking branch 'origin/master'

Conflicts:
	Copy of org.dt340a.group6.sprint1/WebContent/WEB-INF/src/Register.java
trying to resolve the register.class issue
Merge remote-tracking branch 'origin/master'