Tones now work and some other changes.
Merge branch 'master' of https://github.com/damion950/TermProject

Conflicts:
	src/musicApp/OptionsPanel.java