made changes on the original master branch
Merge branch 'master' of https://github.com/wongjas/cpsc310gitlab.git by
jon

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