Octopress init
Site updated at 2014-06-05 05:46:11 UTC
Site updated at 2014-06-05 05:50:06 UTC
Site updated at 2014-06-05 06:03:02 UTC
Merge branch 'master' of github.com:michaelcahill/michaelcahill.github.io

Conflicts:
	index.html