Octopress init
Merge branch 'master' of github.com:colin-scott/colin-scott.github.com

Conflicts:
	index.html
Site updated at 2014-03-31 17:37:28 UTC