Piddly, tiny changes to the interface.
initialized instance vars in MarketPlace
Merge branch 'master' into bvu

Conflicts:
	src/spacetrader/models/Marketplace.java
	src/spacetrader/views/game.fxml