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
made police and market
Merge branch 'jackie'
added SolarSystem size
added ship java
Merge branch 'master' into universe
minor changes to police and market
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
Added Game and UniverseScreen, Updated NewGameWindow, Program now officially creates player