test
commit gitignore
Merge branch 'master' of https://github.com/ruben06/tuprefere

Conflicts:
	src/Acme/DemoBundle/Controller/MainController.php