Octopress init
Site updated at 2014-02-24 15:31:04 UTC
Site updated at 2014-02-24 15:34:07 UTC
Merge branch 'master' of github.com:ctrimble/ctrimble.github.com

Conflicts:
	atom.xml