Added a note about Marvin's whereabouts
Merge branch 'master' of https://github.com/heidifuchs/planets

Conflicts:
	mars.txt