conflit testUbuntu resolu
Conflit RESOLU

Conflicts:
	testUbuntu.txt