i**** SALUT TOUT LE MONDE *****
add feat.txt
correction hotfix
feat
Merge branch 'feature'
Ramon
master of the universe
Merge branch 'master' of https://github.com/jipipi/formation

Conflicts:
	test.txt
Hablo espanol
Merge branch 'master' of https://github.com/jipipi/formation
no message