Project Properties
added outline for buying and selling in market
added getPrice and getIndex to Market
added a ship to player and ship now has cargo
Merge branch 'master' into kristen

Conflicts:
	SpaceTrader/src/spacetrader/Market.java
	SpaceTrader/src/spacetrader/Player.java
fixed gov getters and added keys to good
Backend ready for M5
added back in Police and uncommented references to Market in Planet
GameInstance added
fixed arrays in Corporate
added createUniverse() method in Game
Merge branch 'master' into Sydni

Conflicts:
	SpaceTrader/src/spacetrader/Game.java
	SpaceTrader/src/spacetrader/GameInstance.java
	SpaceTrader/src/spacetrader/Market.java
	SpaceTrader/src/spacetrader/Planet.java
	SpaceTrader/src/spacetrader/Player.java