commiting to merge
Merge branch 'master' of https://github.com/joubin/CSC191

Conflicts:
	backend/src/test/java/controllerTest/UserControllerIntegrationTest.java

merging