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