Merge branch 'bug' into gh-pages
改变了字体大小和颜色
Merge branch 'gh-pages' of https://github.com/ZHENGJIANWEN/maren into gh-pages