Local changes made.
Merge branch 'master' of https://github.com/xiaobitou/demo

Conflicts:
	myfile.txt