change names and countries
changed the userlist.txt

q
merge with part4
changed GitLab.java
edit contact info
Merge branch 'Frank'

* Frank:
  changed GitLab.java
  changed the userlist.txt
  change names and countries

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