Added 2 ints to start merge conflict process
czewen's own branch with both ints = 1
Merge branch 'czebranch' into cze2branch
conflict_start=2, conflict_start2 = 2;
conflict_start = 3, conflict_start2 =3;
Merge branch 'czebranch' into cze2branch, removed conflict_start=2 and conflict_start=2;
retained czebranch's value
Conflicts:
	src/ca/ubc/cpsc310/gitlab/client/GitLab.java
conflict_start = 4, conflict_start2 = 4;
conflict_start = 3, conflict_Start2 = 3