Delete the 'About' page
Switch 'index' to markdown
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html