jkeyll !
Merge branch 'gh-pages' of https://github.com/usstwxy/blog_demo

Conflicts:
	_config.yml
	_layouts/default.html
	index.html