deleted:    library/core.jar
	deleted:    library/gluegen-rt-natives-windows-amd64.jar
	deleted:    library/gluegen-rt.jar
	deleted:    library/jl1.0.jar
	deleted:    library/jogl-all-natives-windows-amd64.jar
	deleted:    library/jogl-all.jar
	deleted:    library/jsminim.jar
	deleted:    library/minim.jar
	deleted:    library/mp3spi1.9.4.jar
	deleted:    library/tritonus_aos.jar
	deleted:    library/tritonus_share.jar
	modified:   .classpath
	deleted:    bin/processing/Barre.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/processing/MyProcessingSketch.class
	modified:   src/processing/MainProcessing.java
	deleted:    bin/processing/Barre.class
Merge branch 'master' of https://github.com/eclar/Sound-LightEMN

Conflicts:
	.classpath
	bin/processing/MainProcessing.class
	src/processing/MainProcessing.java