salope de brigitte!
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
mise a jour gitignore
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	.gitignore.gitignore