плохой код
br1
Merge branch 'origin/master'

Conflicts:
	С„Р°Р№Р»-1.txt
Merge pull request #5 from om-sv/br1

Br1-automerge