form validation
conflicts
conflicts (again)
conflicts
verify email with ajax
Merge branch 'francois-branch'
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria

Conflicts:
	views/register.jade
	views/users/update.jade