modified:   bin/design/Surface3D.class
	modified:   src/design/Surface3D.java
Merge branch 'master' of https://github.com/Willcani/Sound-LightEMN

Conflicts:
	bin/design/Surface3D.class

	modified:   bin/design/Barre.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
	deleted:    bin/design/Surface3D.class
	modified:   bin/processing/MainProcessing.class
	new file:   bin/sound/AudioHandler.class
	renamed:    bin/sound/Fourier.class -> bin/sound/CalculFourier.class
	modified:   bin/sound/Fourier.class
	modified:   bin/sound/Matrice.class
	renamed:    bin/model/MusicFile.class -> bin/sound/MusicFile.class
	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
	new file:   src/sound/AudioHandler.java
	renamed:    src/sound/Fourier.java -> src/sound/CalculFourier.java
	modified:   src/sound/Fourier.java
	modified:   src/sound/Matrice.java
	renamed:    src/model/MusicFile.java -> src/sound/MusicFile.java
	modified:   src/view/MainWindow.java
	bin/design/Surface3D.class
Merge branch 'master' of https://github.com/Willcani/Sound-LightEMN

Conflicts:
	bin/processing/MainProcessing.class

	modified:   bin/sound/CalculFourier.class
	modified:   bin/sound/Fourier.class
	modified:   src/processing/MainProcessing.java
	modified:   src/sound/CalculFourier.java
	modified:   src/sound/Fourier.java
	bin/design/Surface3D.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/processing/MainProcessing.class
	modified:   bin/sound/Fourier.class
	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/Fourier.java
	bin/design/Surface3D.class
	new file:   bin/design/Surface3D.class