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

Conflicts:
	index.html
Site updated at 2014-01-31 09:27:06 UTC