no message
Merge branch 'master' of https://github.com/damion950/TermProject

Conflicts:
	src/musicApp/OptionsPanel.java
This is the submitted version of the project.