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

Conflicts:
	M3/build/built-jar.properties
	M3/build/nb-jfx.jks
	M3/dist/JavaFXApplication6.html
	M3/dist/JavaFXApplication6.jar
	M3/dist/JavaFXApplication6.jnlp