my local changes
Merge branch 'master' of https://github.com/bmbutle2/planets

Conflicts:
	README.md
my changes were better sorry.