conflit de pierre
Merge branch 'master' into oldVersionConflit
Merge branch 'oldVersionConflit'

Conflicts:
	PierreDirectory/branchePierre2.txt