Merge origin/master

Added javadocs to SpaceTraders
Added findReachablePlanets to SpaceTraders
Conflicts:
	src/spacetraders/NewGameController.java