maj ihm
Merge branch 'master' of https://github.com/eclar/Sound-LightEMN

Conflicts:
	bin/.gitignore
	bin/model/CustomShape.class
	bin/processing/CustomProcessing.class
	bin/view/FormsWindow.class
	src/view/FormsWindow.java