made changes however I had to merge for some of kyles work to merge in
Merge branch 'master' of https://github.com/joubin/CSC191

Conflicts:
	backend/src/main/java/com/teamsierra/csc191/api/controller/UserController.java

merging