try git commit
Merge https://github.com/coolBean/zhaoyang
commit zhaoyang