Test de modification sur la branche "master"
Merge branch 'master' into MyNewBranch
Conflit résolu.

Conflicts:
	TestGit.txt