commit 2
Merge branch 'master' of https://github.com/VitalVB/TryGit

Conflicts:
	txt.txt