Panier et commandes
Merge branch 'master' of github.com:novify/batmania

# By Maxime Emorine
# Via Maxime Emorine
* 'master' of github.com:novify/batmania:
  gitignore
  Commentaires

Conflicts:
	src/Novify/FrontBundle/Controller/FrontController.php