store commit-> encounters in progress, won't push until finished
store commit-> encounters in progress, won't push until finished
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/player/Cargo.java
	SpaceTrader/src/spacetrader/player/Gadget.java
	SpaceTrader/src/spacetrader/player/Player.java
	SpaceTrader/src/spacetrader/player/Shield.java
	SpaceTrader/src/spacetrader/player/Ship.java
fixed auto-merge syntax error
Finished encounters