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

Conflicts:
	index.html