modified:   bin/SoundAndLight/Main.class
	modified:   bin/design/Stripes3D.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/processing/MyProcessingSketch.class
	modified:   bin/view/ControlWindow.class
	modified:   bin/view/MainWindow.class
	modified:   src/SoundAndLight/Main.java
	modified:   src/design/Stripes3D.java
	modified:   src/processing/MainProcessing.java
	modified:   src/view/ControlWindow.java
	modified:   src/view/MainWindow.java
	Music/
	bin/controller/
	bin/model/
	src/controller/
	src/model/
	src/processing/MyProcessingSketch.java
	new file:   bin/controller/ControlJButtonDefinedForm.class
	new file:   bin/controller/ControlJButtonFile.class
	new file:   bin/controller/ControlJButtonStream.class
	new file:   bin/model/MusicFile.class
	new file:   src/controller/ControlJButtonDefinedForm.java
	new file:   src/controller/ControlJButtonFile.java
	new file:   src/controller/ControlJButtonStream.java
	new file:   src/model/MusicFile.java
	new file:   src/processing/MyProcessingSketch.java
	Music/
	new file:   Music/Flute.mp3
	deleted:    Music/Flute.mp3
	modified:   bin/SoundAndLight/Main.class
	modified:   bin/design/Barre.class
	modified:   bin/design/Stripes3D.class
	modified:   bin/processing/MainProcessing.class
	modified:   src/SoundAndLight/Main.java
	modified:   src/design/Barre.java
	modified:   src/design/Stripes3D.java
	modified:   src/processing/MainProcessing.java
	bin/sound/FileFreq.class
	src/sound/FileFreq.java
	new file:   bin/sound/FileFreq.class
	new file:   src/sound/FileFreq.java
	modified:   bin/design/Stripes3D.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/processing/MyProcessingSketch.class
	modified:   bin/sound/Fourier.class
	modified:   bin/view/MainWindow.class
	modified:   src/design/Stripes3D.java
	modified:   src/processing/MainProcessing.java
	modified:   src/processing/MyProcessingSketch.java
	modified:   src/sound/Fourier.java
	modified:   src/view/MainWindow.java
	bin/design/Surface3D.class
	bin/sound/Lissage.class
	src/design/Surface3D.java
	src/sound/Lissage.java
	new file:   bin/design/Surface3D.class
	new file:   bin/sound/Lissage.class
	new file:   src/design/Surface3D.java
	new file:   src/sound/Lissage.java
Merge https://github.com/Willcani/Sound-LightEMN into Willcani-master

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

	new file:   Music/Flute.mp3
	modified:   bin/design/Stripes3D.class
	new file:   bin/design/Surface3D.class
	modified:   bin/processing/Barre.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/processing/MyProcessingSketch.class
	modified:   bin/sound/Fourier.class
	new file:   bin/sound/Lissage.class
	modified:   bin/view/MainWindow.class
	modified:   src/design/Stripes3D.java
	new file:   src/design/Surface3D.java
	modified:   src/processing/MainProcessing.java
	modified:   src/processing/MyProcessingSketch.java
	modified:   src/sound/Fourier.java
	new file:   src/sound/Lissage.java
	modified:   src/view/MainWindow.java