made police and market
Merge branch 'jackie'
added SolarSystem size
added ship java
Merge branch 'master' into universe
minor changes to police and market