first commit
Merge branch 'master' of https://github.com/jipipi/formation into branch8

Conflicts:
	test.txt