Test Connectivitée
commit
mergedone
Merge branch 'merge'

Conflicts:
	toto.txt