made a change
Merge origin/master

Conflicts:
	JavaFXApplication6/src/javafxapplication6/JavaFXApplication6.java