Closes #95
Merge remote-tracking branch 'origin/master'

Conflicts:
	automaatnehindaja/src/automaatnehindaja/GetAllUsers.java