change to b
Merge branch 'master' of https://github.com/jah1236/planets

decided to use both

Conflicts:
	mars.txt