commit
Merge branch 'master' of https://github.com/superny/PracticeGit

Conflicts:
	pro.txt