blog_20140706_Beta
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
	_posts/2012-09-12-how-to-write-a-blog.md