commit branch4
Merge branch 'branch4' of https://github.com/jipipi/Formation into branch4

Conflicts:
	test.txt