get_users returns a list of User objects now
Model fixed
Merge branch 'master' into Armageddon

Conflicts:
	src/model.py