commit de merge
Merge branch 'branch8' of https://github.com/jipipi/formation into branch8

Conflicts:
	modifiedtest.txt