.
Merge remote-tracking branch 'github/newbrunch'

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