Modified ShipYard
Modified ShipYard
Fixed the file structure
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
M8 updated
add M8
old shipYard
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

pull shipyard from upsteam
M10
M10 Merge branch 'master' of https://github.com/OBipolar/java-CS2340
qMerge 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
	M7/src/spaceTrader/Tests/MarketPlaceJunit.java
	M7/src/spaceTrader/Tests/MarketPlaceTest.java
	M7/src/spaceTrader/Tests/RandomEventJunit.java
	M7/src/spaceTrader/Tests/RandomEventTest.java
	M7/src/spaceTrader/Tests/SqliteAPIJunit.java
	M7/src/spaceTrader/Tests/SqliteAPITest.java
	M8/src/spaceTrader/Tests/MarketPlaceJunit.java
	M8/src/spaceTrader/Tests/RandomEventJunit.java
	M8/src/spaceTrader/Tests/SqliteAPIJunit.java