更改root
Merge branch 'gh-pages' of https://github.com/pascallin/lingjianfeng into gh-pages

Conflicts:
	index.html