Modif
Modif
Merge branch 'master' of https://github.com/Willcani/Sound-LightEMN.git
Signed-off-by: Willcani <facchiniguillaume@gmail.com>
	modified:   bin/SoundAndLight/Main.class
	modified:   bin/controller/ControlButtonForms.class
	modified:   bin/design/Cercles.class
	modified:   bin/design/Design.class
	modified:   bin/design/Hypercube.class
	modified:   bin/design/Rond.class
	modified:   bin/design/Stripe.class
	modified:   bin/design/Stripes3D.class
	modified:   bin/design/Surface3D.class
	modified:   bin/processing/MainProcessing.class
	modified:   bin/sound/FileFreq.class
	new file:   bin/view/FormsWindow.class
	modified:   src/SoundAndLight/Main.java
	modified:   src/controller/ControlButtonForms.java
	modified:   src/design/Cercles.java
	modified:   src/design/Design.java
	modified:   src/design/Hypercube.java
	modified:   src/design/Rond.java
	modified:   src/design/Stripe.java
	modified:   src/design/Stripes3D.java
	modified:   src/design/Surface3D.java
	modified:   src/processing/MainProcessing.java
	modified:   src/sound/FileFreq.java
Signed-off-by: Willcani <facchiniguillaume@gmail.com>
Merge branch 'master' of https://github.com/Willcani/Sound-LightEMN.git

Conflicts:
	bin/processing/MainProcessing.class
	src/processing/MainProcessing.java
Signed-off-by: Willcani <facchiniguillaume@gmail.com>
Merge pull request #16 from Willcani/master

Merge