ma commit dev 1
Merge branch 'master' of https://github.com/tawala777/testprojet

Conflicts:
	data.txt