I want to use Jekyll instead of octopress. Don't ask.
Merge branch 'master' of https://github.com/mihcall/mihcall.github.io

Conflicts:
	index.html