Added Merchants and Removed Planet Frogs for Testing. (Frogs to be in the major City Spaceports)