Ajout du order
Merge branch 'philippe-branch'

Conflicts:
	public/stylesheets/style.css
	routes/users.js
	views/users/update.jade