xxx commit
Merge branch 'master' into brach2

Conflicts:
	bugoga.txt
Merge pull request #3 from bool-rus/brach2

xxx commit