a
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M3/build/built-jar.properties
	M3/build/classes/javafxapplication6/ConfigurePageController.class
	M3/build/nb-jfx.jks
	M3/dist/Game.jar
	M3/dist/Game.jnlp
	M3/nbproject/build-impl.xml
	M3/nbproject/genfiles.properties
	M3/nbproject/project.properties
	M3/nbproject/project.xml