derping with the temporary copy
Merge branch 'master' of https://github.com/rad22011/planets

Conflicts:
	mars.txt