quick change
Merge branch 'master' of https://github.com/ThunderFox/Space-Rider

Conflicts:
	css/MarsSpaceRiderStyle.css