merge of tst into master after hard reset
Merge branch 'master' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt