сменил голосву
перед мержем
Merge branch 'br8' into temp_head

Conflicts:
	README.txt
all in one
sdfkslfslkMerge branch 'br8' into fromHead

Conflicts:
	README.txt