master commit
Merge branch 'master' of https://github.com/chanxiaoxi/chanxiaoxi.github.com

2.
master