deleted
Merge branch 'master' of https://github.com/Konro1/test

Conflicts:
	tets.txt