ma modif2
Merge branch 'branch3' of https://github.com/jipipi/formation into branch3

Conflicts:
	test.txt