I'm helping
Merge branch 'master' of https://github.com/Jaxsun/UBCCPSCGitLab

Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/user/User.java