ninja
Merge branch 'master' of github.com:Matael/gittest
Merge branch 'master' of github.com:Matael/gittest

Conflicts:
	monfichier.txt