kevin merge
kevin merge 2
corrections git merge
Merge branch 'master' of https://github.com/kevinelain/festivalKEOLPM

Conflicts:
	build/classes/pkgVue/JPanelOffHeber$1.class
	build/classes/pkgVue/JPanelOffHeber$2.class
	build/classes/pkgVue/JPanelOffHeber$3.class
	build/classes/pkgVue/JPanelOffHeber$4.class
	build/classes/pkgVue/JPanelOffHeber.class
	build/classes/pkgVue/JPanelOffHeber.form
	nbproject/private/private.properties
	src/pkgVue/JPanelOffHeber.form
	src/pkgVue/JPanelOffHeber.java