rearrange index
Merge branch 'master' of github.com:karkhaz/site

Conflicts:
	content/index.markdown