nhdxg
Merge branch 'master' of https://github.com/DmitrySidorov/dev_progress into branch_1

Conflicts:
	Новый текстовый документ.txt
Merge pull request #5 from DmitrySidorov/branch_1

Branch 1