local tst commit.
local master 1.
Merge branch 'master' of github.com:gildarts/gitlearning

Conflicts:
	README.md
master local2.
local test change1.
Merge branch 'test'

Conflicts:
	README.md