dish
Merge branch 'master' of github.com:erac44/MyCooker

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Merge branch 'master' of github.com:erac44/MyCooker

Conflicts:
	app/AppKernel.php
	app/config/routing.yml