Merge branch 'gh-pages' of https://github.com/dupengtao/Blog.git into
gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/dupengtao/Blog.git into
gh-pages