Added the mass of Mars.
Added the mass of mars.
Added diameter of mars.
Added diameter of Mars
Added when mars was first recorded.
Added when Mars was first recorded.
Added moons file with Phobos info.
Added moons file with Phobos info
Added Jupiter's mass in new file.
Added Jupiters mass in new file.
Merge branch 'moons'
Merge branch 'moons'
Added line from master
Added line from master
Line added from moons branch
Line added from Moons branch
Pulling changes from master into moons.
Pulling changes from master into moons.
Merge branch 'master' of https://github.com/spthm/planets

Conflicts:
	jupiter.txt
	mars.txt
	moons.txt
Merge branch 'master' of https://github.com/ocaisa/planets