22
Merge branch 'master' into branch_1

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