update
Merge branch 'master' of https://github.com/anthonyassi/Drum-Synthesizer

Conflicts:
	version 6/Actions.class
	version 6/Actions.java
	version 6/Actions.java~
	version 6/Exiter.class
	version 6/Exiter.java
	version 6/Interface.class
	version 6/Interface.java
	version 6/Interface.java~
	version 6/Open.png
	version 6/PlaySample.class
	version 6/PlaySample.java
	version 6/PlaySample.java~
	version 6/SliderListener.class
	version 6/SliderListener.java
	version 6/SliderListener.java~
	version 6/Yamaha-SY-35-Clarinet-C5.wav
version 7
Merge branch 'master' of https://github.com/anthonyassi/Drum-Synthesizer

Conflicts:
	Sprint Plan 2.doc