worked on UI for marketplace
worked on UI for marketplace
finished UI for marketplace
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/view/SolarSystemViewController.java