test
Merge branch 'master' of https://github.com/nkorneva/first.git
test local commit
local update
test
new_test_local
using ours
local
Merge branch 'master' of https://github.com/nkorneva/first.git

Conflicts:
	test