Merge pull request #1 from Willcani/master

	new file:   bin/design/Barre.class
	modified:   bin/SoundAndLight/Main.class
	new file:   bin/controller/ControlJButtonDefinedForm.class
	new file:   bin/controller/ControlJButtonFile.class
	new file:   bin/controller/ControlJButtonStream.class
	new file:   bin/model/MusicFile.class
	modified:   bin/view/ControlWindow.class
	modified:   bin/view/MainWindow.class
	modified:   src/SoundAndLight/Main.java
	new file:   src/controller/ControlJButtonDefinedForm.java
	new file:   src/controller/ControlJButtonFile.java
	new file:   src/controller/ControlJButtonStream.java
premier controller, pac
fixed merge conflicts
Merge pull request #2 from Willcani/master

Delete Daybreak.m4a
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
	modified:   bin/SoundAndLight/Main.class
	modified:   bin/design/Barre.class
	modified:   bin/design/Stripes3D.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/processing/MyProcessingSketch.class
	modified:   src/SoundAndLight/Main.java
	modified:   src/design/Barre.java
	modified:   src/design/Stripes3D.java
	modified:   src/processing/MainProcessing.java
	modified:   src/processing/MyProcessingSketch.java
	modified:   src/view/MainWindow.java
	bin/java.policy.applet
	bin/sound/FileFreq.class
	src/sound/FileFreq.java
	new file:   bin/java.policy.applet
	new file:   bin/sound/FileFreq.class
	new file:   src/sound/FileFreq.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
Merge pull request #6 from Willcani/master

	modified:   src/sound/Lissage.java
Merge pull request #7 from Willcani/master

Test 2
Merge pull request #8 from Willcani/master

Création Hypercube un concept !
Merge pull request #9 from Willcani/master

Suppresion librairies Win64:
Merge pull request #10 from Willcani/master

MAJ : Classes Hypercube, Matrice et Lumières
Merge pull request #11 from Willcani/master

Ptites modifs, rien d'extraordinaire
	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
Delete 1230.mp3
Delete House.mp3