Merge branch 'gh-pages'

Conflicts:
	_posts/2014-02-08-welcome-to-jekyll.markdown