small changes to mars, test conflicts.
added line to mars
Merge branch 'master' of https://github.com/mgh13/planets1
added a modification to pluto.txt