fichier demo en texte
Merge branch 'master' of https://github.com/pgshehata/demo_git
modifier le code hello Peter
Merge branch 'master' of https://github.com/pgshehata/demo_git

Conflicts:
	demo.txt