(retry after rollback) Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
(second commit after pull-after retry)Merge branch 'master' of https://github.com/EBAdmin/TestRepo