deleted:    Music/Flute.mp3
	modified:   bin/design/Design.class
	modified:   bin/design/Rond.class
	deleted:    bin/processing/Stripe.class
	modified:   bin/sound/Fourier.class
	modified:   bin/view/MainWindow.class
	modified:   src/design/Design.java
	modified:   src/design/Rond.java
	deleted:    src/processing/Barre.java
	deleted:    src/processing/Stripe.java
	modified:   src/sound/Fourier.java
	modified:   src/view/MainWindow.java
	bin/design/Cercles.class
	bin/design/Stripes3D.class
	bin/processing/MainProcessing.class
	src/design/Cercles.java
	src/design/Stripes3D.java
	src/processing/
	bin/design/Cercles.class
	bin/design/Stripes3D.class
	bin/processing/MainProcessing.class
	src/design/Cercles.java
	src/design/Stripes3D.java
	new file:   bin/design/Cercles.class
	new file:   bin/design/Stripes3D.class
	new file:   bin/processing/MainProcessing.class
	new file:   src/design/Cercles.java
	new file:   src/design/Stripes3D.java
Merge branch 'Branche-fusion' of https://github.com/Willcani/Sound-LightEMN into Willcani-Branche-fusion

Conflicts:
	bin/view/MainWindow.class
	src/processing/MyProcessingSketch.java
	src/view/MainWindow.java

	deleted:    Music/Flute.mp3
	new file:   bin/design/Cercles.class
	modified:   bin/design/Design.class
	modified:   bin/design/Rond.class
	new file:   bin/design/Stripes3D.class
	new file:   bin/processing/MainProcessing.class
	deleted:    bin/processing/Stripe.class
	modified:   bin/sound/Fourier.class
	new file:   src/design/Cercles.java
	modified:   src/design/Design.java
	modified:   src/design/Rond.java
	new file:   src/design/Stripes3D.java
	deleted:    src/processing/Barre.java
	new file:   src/processing/MainProcessing.java
	deleted:    src/processing/Stripe.java
	modified:   src/sound/Fourier.java
	modified:   src/view/MainWindow.java