first post
Merge branch 'gh-pages' of https://github.com/zx444923611zx/zx into gh-pages

Conflicts:
	_posts/2013-08-25-hello-world.html
	index.html