xxxxx
Merge branch 'master' of https://github.com/CaoJune/git_demo

Conflicts:
	readme.txt