new style
Merge branch 'master' of https://github.com/xieguanglei/xieguanglei.github.com
mistake push on web