conflict 2
awar
Merge remote-tracking branch 'origin/lisa2'

Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java