modif du README
hello world
changmnt du passe
merged test into master
Update README.txt
Update README.txt
test conflit
Merge branch 'master' of https://github.com/jglouis/tuto_git

Conflicts:
	README.txt