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

Conflicts:
	index.html