Changed javadoc
Changed javadoc
Merge origin/master
Removed getPlanet method in SpaceTrader class