userA commit
Merge remote-tracking branch 'origin/utilisateurA'

Conflicts:
	truc.txt