Merge branch 'gh-pages' of https://github.com/solome/jyp.template into gh-pages
保持与主分支同步
解决冲突