Updated
updated
Fixed lab2m conflict
Merge branch 'lab2m'

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