Looking into different queries for User. Fixed some errors with our restController
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1

Conflicts:
	src/main/java/com/entities/User.java