adsf
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/SpaceTrader.db
	M7/src/spaceTrader/APIs/ShipYard.java
	M7/src/spaceTrader/APIs/SqliteAPI.java
Ship upgrades available