fix conflicts
fix conflicts
Adds mail function to the lib
Merge branch 'francois-branch'

Conflicts:
	routes/users.js
	views/register.jade
	views/users/update.jade
Adds constants
Merge branch 'master' into francis-branch
Ajout du order
Merge branch 'philippe-branch'

Conflicts:
	public/stylesheets/style.css
	routes/users.js
	views/users/update.jade
Beautify code
Adds little css tweaks
Adds fix for li link not taking all available height
Some changes I don't remember
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria
Merge branch 'francis-branch'
master merge