Government changes

Syncing to see if there is easy fix to my stupidity, commented out stuff
so it will run either way
Merge remote-tracking branch 'origin/master'

Conflicts:
	star_system/Government.java
Merge branch 'master' of https://github.com/teamtyn/spacetrader