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
minor changes, experimenting with git
test commit and push to github
Merge remote-tracking branch 'origin/master'