update Market CalcPrice & money from int to double
fixed polsystem & demand also updated market a bit
forgot pacifist state lol overrides added
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceTrader/src/spacetrader/Corporate.java
	SpaceTrader/src/spacetrader/Market.java
M5 with screen changing bug
Fixed null pointers
fixed a few things
Merge branch 'master' of github.com:RockLobsters/Space-Traders
adding multiple of same item to cargo
single items in cargo
checking goodtype equality instead of pointer equality
Everything Traveling
finished save and load game methods in GameInstance
Merge branch 'master' into kristen
Added Random events
Merge branch 'master' into Sydni

Conflicts:
	SpaceTrader/src/spacetrader/Anarchy.java
	SpaceTrader/src/spacetrader/CapitalistState.java
	SpaceTrader/src/spacetrader/CommunistState.java
	SpaceTrader/src/spacetrader/Confederacy.java
	SpaceTrader/src/spacetrader/Corporate.java
	SpaceTrader/src/spacetrader/Cybernetic.java
	SpaceTrader/src/spacetrader/Democracy.java
	SpaceTrader/src/spacetrader/Dictatorship.java
	SpaceTrader/src/spacetrader/FacistState.java
	SpaceTrader/src/spacetrader/FeudalState.java
	SpaceTrader/src/spacetrader/Game.java
	SpaceTrader/src/spacetrader/Good.java
	SpaceTrader/src/spacetrader/GoodType.java
	SpaceTrader/src/spacetrader/GoodTypes.java
	SpaceTrader/src/spacetrader/Market.java
	SpaceTrader/src/spacetrader/MilitaryState.java
	SpaceTrader/src/spacetrader/Monarchy.java
	SpaceTrader/src/spacetrader/PacifistState.java
	SpaceTrader/src/spacetrader/Player.java
	SpaceTrader/src/spacetrader/PoliticalSystem.java
	SpaceTrader/src/spacetrader/Satori.java
	SpaceTrader/src/spacetrader/Ship.java
	SpaceTrader/src/spacetrader/SocialistState.java
	SpaceTrader/src/spacetrader/Technocracy.java
	SpaceTrader/src/spacetrader/Theocracy.java