FIX DES BUGS
Merge branch 'philippe-branch'

Conflicts:
	routes/restaurants.js