Changed mars.txt
Merge branch 'master' of https://github.com/pguigli/planets
?
Merge branch 'master' of https://github.com/pguigli/planets
Merging conflict from Github
Conflicts:
	mars.txt