#47
修改页面样式
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/issue47'
Merge remote-tracking branch 'origin/master'
fix bug
Merge pull request #139 from xiechao06/bug_fixer

Bug fixer