blog
Merge branch 'master' of https://github.com/tuteng/myblog

Conflicts:
	_config.yml
	source/_layouts/post.html