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