implemented Comparable in Mercenary
finished universe
Merge branch 'Sydni'
Bring governments into universe
changed Government to PoliticalSystem and Building to Market
getters and setters for politicalSystem
added SolarSystem size
added ship java
Merge branch 'master' into universe
minor changes to police and market
Added Game and UniverseScreen, Updated NewGameWindow, Program now officially creates player
Merge branch 'Sydni'
Cleaned up a bit of Market
removed references to market from Planet temporarily
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders
Merge branch 'master' into kristen

Conflicts:
	SpaceTrader/src/spacetrader/Market.java
	SpaceTrader/src/spacetrader/Planet.java
	SpaceTrader/src/spacetrader/Universe.java
Merge branch 'master' of github.com:RockLobsters/Space-Traders
ready for m4
Merge branch 'kristen'
Project Properties