Octopress init
Site updated at 2014-05-07 12:05:09 UTC
Site updated at 2014-05-07 12:07:03 UTC
Merge branch 'master' of github.com:stevesbrain/stevesbrain.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-05-07 12:16:08 UTC