insert a new modif2 in test file
Merge branch 'master' into dev1

Conflicts:
	test.txt