- - 哎
Merge branch 'gh-pages' of https://github.com/iischajn/github_blog into gh-pages

Conflicts:
	index.html