conflict now? changed do nothing function
Removed alert
Merge remote-tracking branch 'origin/ch3no3' into scootaloo
Changed GitLab.java
Changed GitLab.java
CHanged to 20
Changed to 30
change gitlab
Revert "Changed to 30"

This reverts commit 87696efe3da33d1a827369694d59b2e9d4973c83.
change gitlab1
change gitlab2
Merge branch 'scootaloo'

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