Merge branch 'master' into francois-branch2
restaurateur address
Merge branch 'master' into francois-branch2
restaurateur
Merge branch 'francois-branch2'
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria
Merge branch 'master' into francois-branch2
Potato salad
Merge branch 'philippe-branch'
Merge branch 'philippe-branch'
Merge branch 'philippe-branch'
Merge branch 'philippe-branch'

Conflicts:
	routes/restaurants.js
Assignation des restaurants dans les user
Merge branch 'master' into francois-branch2
Merge branch 'francois-branch2'
Merge branch 'master' into francois-branch2
fix restaurateur update
Merge branch 'francois-branch2'