Merge branch 'master' of github.com:jiangdairong/Web_project
Merge branch 'gh-pages' of https://github.com/jiangdairong/Web_project into gh-pages