..
Merge branch 'master' of github.com:Dostoy320/WavRunner

Conflicts:
	build/built-jar.properties
	build/classes/NewJFrame.class
	build/nb-jfx.jks
	src/NewJFrame.form
	src/NewJFrame.java