here are some more comments
Merge branch 'master' of git://github.com/a-rbutus/gitlab.git

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