样式
Merge branch 'master' of git://github.com/knightliao/disconf
Merge branch 'master' of git://github.com/knightliao/disconf
Merge branch 'master' of git://github.com/knightliao/disconf
修改样式
Merge pull request #5 from nabilzhang/master

部分样式修改bug修复