le panier marche
panier
panier nom de dieu
a
Merge branch 'master' of https://github.com/toborrow/glowing-happiness

Conflicts:
	Symfony/src/Resto/MainBundle/Resources/views/Resto/resto.html.twig