Moving the index post into a blog post
Merge branch 'master' into blog

Conflicts:
	content/index.md
Removing the unnecessary