分支修改
Update demo.txt
Merge branch 'master' of https://github.com/liqing86mj/firstDemo

Conflicts:
	demo.txt
second conflict
Merge branch 'master' of https://github.com/liqing86mj/firstDemo
conflict test