commit in study branch..
local pc commit
Merge branch 'study'
pull down the demo1.txt and solve the conflict.