Merge remote-tracking branch 'origin/physics' into WorkingNewArch

Conflicts:
	.gradle/2.1/taskArtifacts/cache.properties.lock
	.gradle/2.1/taskArtifacts/fileHashes.bin
	.gradle/2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	.nb-gradle/private/cache/StarSpace-d41d8cd98f00b204e9800998ecf8427e
	build/classes/main/spacetrader/MainCtrl.class
	build/classes/main/spacetrader/createcharacter/CreateCharacterCtrl.class
	build/classes/main/spacetrader/createcharacter/CreateCharacterView.class
	build/classes/main/spacetrader/menu/MenuView.class
	build/libs/CS2340.jar
	src/main/java/spacetrader/MainCtrl.java
	src/main/java/spacetrader/controlship/ControlShipCtrl.java
	src/main/java/spacetrader/galaxygenerators/GalaxyGeneratorCtrl.java
	src/main/java/spacetrader/galaxygenerators/JumpPointsGenerator.java
	src/main/java/spacetrader/galaxygenerators/SimpleStarSystemGenerator.java
	src/main/java/spacetrader/game_model/Planet.java
	src/main/java/spacetrader/game_model/Ship.java
	src/main/java/spacetrader/game_model/gameLogic/Item.java
	src/main/java/spacetrader/game_model/system/Galaxy.java
	src/main/java/spacetrader/game_model/system/JumpPoint.java
	src/main/java/spacetrader/maketrade/MakeTradeCtrl.java
	src/main/java/spacetrader/maketrade/MakeTradeView.java
Integrated the shipControl and galaxyGenerator to the new Architecture.