Potato salad
Debut accept order
Merge branch 'philippe-branch'
prepare order
Merge branch 'philippe-branch'
Preparation complete

Pepito peut maintenant décider de s’approprier une commande et la
préparer… Merci PEPITO.
Merge branch 'philippe-branch'
FIX DES BUGS
Merge branch 'philippe-branch'

Conflicts:
	routes/restaurants.js
Merge branch 'master' into francois-branch2