Text conflit
Merge branch 'master' of github.com:aniblock/git-exercice

Conflicts:
	README.txt