Merge remote-tracking branch 'origin/ui'
Merge remote-tracking branch 'origin/async'

Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java
	src/ca/ubc/cpsc310/gitlab/client/user/User.java
Restored userlist.txt
Formatted userlist.txt
Fixed errors