conflit
Merge branch 'master' of https://github.com/SnowTox/ProjetQCMjava7.git

Conflicts:
	appliQCM/TESTGIT/test.txt