meeting bryan's conflict
Merge branch 'master' of https://github.com/Shadowflares/310Lab2.git

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