Octopress init
Site updated at 2014-08-20 16:37:43 UTC
Site updated at 2014-08-20 17:04:06 UTC
Merge branch 'master' of github.com:CarltonShepherd/carltonshepherd.github.io

Conflicts:
	about/index.html
	atom.xml
	blog/archives/index.html
	index.html
	robots.txt
	sitemap.xml