Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base
* 规范增加-四个空格缩进
Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base
* 调整disk.h 的编码规范
Merge pull request #91 from zpublic/sum_base

Sum base
* 修正一下单元测试
Merge branch 'master' of https://github.com/zpublic/zpublic