implemented Comparable in Mercenary
finished universe
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
Cleaned up a bit of Market
removed references to market from Planet temporarily