Conflit2
fusion
bug
secondeTry
plan
modif
debug
debug
Merge remote-tracking branch 'origin/master'

Conflicts:
	appliQCM/TESTGIT/test.txt