My CHANGE goes
Merge branch 'master' of https://github.com/LukGraf/planets
Resolved order of lines.

Conflicts:
	mars.txt