"Commiting to push to origin"
trying to cause a mess again
Merge remote-tracking branch 'gitlab2/gustav-conflict'

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