Post Preview
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-10-1-welcome-post.md