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

Conflicts:
	2.txt
(REDO2)Merge branch 'master' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt