hehehehhe
Merge branch 'master' of github.com:FanjunMeng/test-git

Conflicts:
	readme.txt