模版修正

Conflicts:
	_posts/2013-06-22-hello-world.html
	index.html