good changes
Merge branch 'master' of https://github.com/Rassvet/net13

Conflicts:
	file1.txt