Merge branch 'gh-pages' of https://github.com/lighter1203/My_website into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/lighter1203/My_website into gh-pages