updated encounters and reputation
updated encounters and created battlescreen
updated encounters
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan

Conflicts:
	SpaceTrader/src/model/TradeGood.java
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose

Conflicts:
	SpaceTrader/src/model/TradeGood.java
M7 Progress