new Change conflict
Merge branch 'master' of https://github.com/LirpaEcarg/Practice1

Conflicts:
	readme.txt