php yaoqingma v1.0
Merge branch 'master' of https://github.com/maicong/yaogingma

Conflicts:
	README.md