uq
uMerge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/SpaceTrader.db
	M7/src/spaceTrader/APIs/SqliteAPI.java
	README.md
u
iuMerge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/SpaceTrader.db
a
aMerge branch 'master' of https://github.com/OBipolar/java-CS2340
M8 done
dsfMerge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/SpaceTrader.db