Now I'm adding stuff
Merge branch 'master' of https://github.com/benincsm/planets

Compromise...

Conflicts:
	mercury.txt