maincontroller

created a main controller. spawn player. change player location. planet
labels. marketplace sell & buy screen. Prints prices and inventory in
marketplace
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader

Conflicts:
	SpaceTrader/bin/spacetrader/BigController.class
	SpaceTrader/bin/spacetrader/BlankController.class
	SpaceTrader/bin/spacetrader/CargoBay.class
	SpaceTrader/bin/spacetrader/ConfigurationScreenController.class
	SpaceTrader/bin/spacetrader/ERRORController.class
	SpaceTrader/bin/spacetrader/GiantController.class
	SpaceTrader/bin/spacetrader/InsertNameController.class
	SpaceTrader/bin/spacetrader/Marketplace.class
	SpaceTrader/bin/spacetrader/NAMEController.class
	SpaceTrader/bin/spacetrader/NONAMEController.class
	SpaceTrader/bin/spacetrader/PlanetController.class
	SpaceTrader/bin/spacetrader/Player.class
	SpaceTrader/bin/spacetrader/S1Controller.class
	SpaceTrader/bin/spacetrader/S2Controller.class
	SpaceTrader/bin/spacetrader/S3Controller.class
	SpaceTrader/bin/spacetrader/S3PT2Controller.class
	SpaceTrader/bin/spacetrader/SPAAACEController.class
	SpaceTrader/bin/spacetrader/Ship.class
	SpaceTrader/bin/spacetrader/SpaceTrader.class
	SpaceTrader/bin/spacetrader/Universe.class
	SpaceTrader/bin/spacetrader/YourNamingSucksController.class