*shortcut注释修改
Merge branch 'master' of https://github.com/picctree/zpublic
*shortcut缩进修改
Merge branch 'master' of https://github.com/picctree/zpublic
*缩进问题
Merge branch 'master' of https://github.com/picctree/zpublic
*注释缩进修改
Merge branch 'master' of https://github.com/picctree/zpublic
*注释修改
Merge branch 'master' of https://github.com/picctree/zpublic
Merge pull request #5 from picctree/master

* 我叉, 又是对齐