Messed with marketplace
Range on fuel
Implements fuel.
Changed the universe map's green radius
added stuff
-bj
fuel leak random event
Update ShipTest.java
Update UniverseTest.java
Update MarketPlaceTest.java
Merge remote-tracking branch 'origin/gui7'

Conflicts:
	WorkInProgress/src/model/MarketPlace.java
	WorkInProgress/test/model/MarketPlaceTest.java