Merge pull request #3 from DmitrySidorov/branch_1

Branch 1
Merge pull request #4 from DmitrySidorov/branch_1

Branch 1
sdgsdgdsg
Merge branch 'master' of https://github.com/DmitrySidorov/dev_progress into branch_1
lhjon
Update Новый текстовый документ.txt
Update Новый текстовый документ.txt
nhdxg
Merge branch 'master' of https://github.com/DmitrySidorov/dev_progress into branch_1

Conflicts:
	Новый текстовый документ.txt