change
Merge branch 'master' of github.com:ilting/pandarose

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