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

Conflicts:
	index.html
Site updated at 2014-04-17 03:51:08 UTC