commit d'un conflit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projet/bin/.gitignore