maybe
maybe 4
Merge branch 'master' of https://github.com/shockwav213/Testing

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