local change
local commit
Merge branch 'master' of https://github.com/ogusarenko/test

Conflicts:
	test_file_3