Ajout du .gitignore
Ajout du .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config.php
Ajout du .gitignore