modif
Merge branch 'master' of https://github.com/saidouda/DemoExemple

Conflicts:
	essai.txt