test by fam
Merge pull request #2 from famwiner/master

test by fam
Merge branch 'master' of https://github.com/LetWon/TestKing into Zcx_test
111