second commit
Merge branch 'gh-pages' of https://github.com/xiejd/myBlog into gh-pages

Conflicts:
	_config.yml