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

Conflicts:
	index.html