1
22
Merge branch 'master' into branch_1

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

Branch 1