Added name to userlist.txt
Merge branch 'test'

Conflicts:
	src/userlist.txt