new branch for merge conflict
Merge remote-tracking branch 'origin/lab2m' into assign2

Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java
Fixed the conflict
Merge branch 'assign2'