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