conflict on index
Merge branch 'master' of https://github.com/ThunderFox/Space-Rider

Conflicts:
	index.html