555
Merge branch 'master' of github.com:SmileOmsk/test into test_b

Conflicts:
	test.txt