Add line to put the users routes below for easy merge
Comment
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/app/router.js