local tst commit.
local test change1.
Merge branch 'test'

Conflicts:
	README.md
ttt
test
Merge branch 'master' of github.com:gildarts/gitlearning into from_master

Conflicts:
	README.md