Tech Level restricts shipard items
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/SpaceTrader.db
Merge branch 'master' of https://github.com/OBipolar/java-CS2340
TradeSellTest added