style
Merge branch 'master' of https://github.com/Johnqing/johnqing.github.com