a2
a2
Merge branch 'master' of https://github.com/aransav/ece356projectRev3

Conflicts:
	proj/src/main/java/ca/uw/proj/controller/UserController.java

Signed-off-by: ARAN SAVUNDARARASA <A2SAVUND@uwaterloo.ca>
Merge branch 'master' of https://github.com/aransav/ece356projectRev3