Creating conflict
Conflict

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