rename index.html to index.md
delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.md