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

Conflicts:
	index.html