bugged merge
Merge branch 'jonathan-branch

Conflicts:
	routes/users.js