modification  terminé!
modification terminé
Merge branch 'master' of https://github.com/samarra/project

Conflicts:
	Nouveau document texte.txt