space trader

trader
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader

Conflicts:
	SpaceTrader/bin/spacetrader/Planet.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/SolarSystem.class
	SpaceTrader/bin/spacetrader/YourNamingSucksController.class
	SpaceTrader/src/spacetrader/Ship.java