salut
Merge branch 'master' of https://github.com/aniblock/git-exercice

Conflicts:
	README.md