New commit
Merge branch 'master' of github.com:RomaDziuba/try_git

Conflicts:
	123.txt