Merge branch 'gh-pages' of github.com:hurui1987/blog

Conflicts:
	_config.yml
Merge branch 'gh-pages' of github.com:hurui1987/blog

Conflicts:
	_config.yml