use src to build fx project
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M7/.pmd
	M7/SpaceTrader.db
	M7/src/spacetrader/view/ConfigurePageController.java
	M7/src/spacetrader/view/GameScreenController.java