Introduced conflict in this branch
Merge branch 'master' of https://github.com/jimmec/cs310-lab2

Conflicts:
	src/userlist.txt