tst-3
Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt