Fixing File Structure
Merge branch 'master' of https://github.com/linalana/ProgrammingPirates

Conflicts:
	SpaceTrader/build/built-jar.properties

SpaceTrader/build/classes/spacetrader/engine/CurrentPortTabPageControlle
r.class
	SpaceTrader/build/classes/spacetrader/engine/EncounterController.class

SpaceTrader/build/classes/spacetrader/engine/MarketplaceScreenController
.class

SpaceTrader/build/classes/spacetrader/engine/PlayerConfigurationControll
er.class

SpaceTrader/build/classes/spacetrader/engine/TravelTabPageController.cla
ss

SpaceTrader/build/classes/spacetrader/engine/WelcomeScreenController.cla
ss
	SpaceTrader/build/classes/spacetrader/model/Game.class
	SpaceTrader/build/classes/spacetrader/model/Turn.class
	SpaceTrader/build/nb-jfx.jks
	SpaceTrader/dist/SpaceTrader.html
	SpaceTrader/dist/SpaceTrader.jar
	SpaceTrader/dist/SpaceTrader.jnlp
	SpaceTrader/dist/lib/controlsfx-8.20.7.jar
	SpaceTrader/dist/lib/controlsfx-8.20.8.jar
	SpaceTrader/nbproject/private/private.xml
	SpaceTrader/src/spacetrader/engine/EndScreenController.java