Edited from bipolar me
Merge branch 'master' of https://github.com/eagroti/planets

Conflicts:
	planets/mars.txt