Modification du gitignore
Merge branch 'master' of https://github.com/skalde54/notre_depot_est_bien_cache_lol

Conflicts:
	Symfony/app/cache/dev/appDevDebugProjectContainer.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.php.meta
	Symfony/app/cache/dev/appDevDebugProjectContainer.xml
	Symfony/app/cache/dev/appDevDebugProjectContainerCompiler.log
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/appDevUrlMatcher.php.meta
	Symfony/app/cache/dev/assetic/routing.yml
	Symfony/app/cache/dev/classes.php
	Symfony/app/cache/dev/classes.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/logs/dev.log
	Symfony/bin/doctrine
	Symfony/bin/doctrine.php
Merge branch 'master' of https://github.com/skalde54/notre_depot_est_bien_cache_lol

Conflicts:
	Symfony/app/cache/dev/profiler/index.csv