Octopress init
Merge branch 'master' of github.com:Dillion/dillion.github.io

Conflicts:
	index.html
Site updated at 2014-05-17 09:26:24 UTC