Whoops?
Merge conflicts

Conflicts:
	_site/2013/12/31/whats-jekyll/index.html
	_site/2014/01/01/example-content/index.html
	_site/2014/01/02/introducing-lanyon/index.html
	_site/404.html
	_site/about/index.html
	_site/atom.xml
	_site/index.html