first commit
Merge branch 'master' of github.com:xj626852095/kevin_xiang