implemented Comparable in Mercenary
finished universe
changed Government to PoliticalSystem and Building to Market
getters and setters for politicalSystem
added SolarSystem size
added ship java
minor changes to police and market
initial planets and solar systems instantiated

will go back and make more interesting for replay after this milestone
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