Update index.md
Update index.md
Merge remote-tracking branch 'origin/github-master'

Conflicts:
	index.md
Fixing merge
Merge branch 'github-master'
Merge branch 'github-master'