GitLab.java of bonbon branch updated
Merge branch 'bonbon' of http://github.com/weedle/tetryl-icecream

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