Basic UI junk.
Merge branch 'master' of https://github.com/damion950/TermProject

Conflicts:
	bin/musicApp/Instrument.class
	src/musicApp/Instrument.java
Merge branch 'master' of https://github.com/damion950/TermProject

Conflicts:
	bin/musicApp/Instrument.class
	bin/musicApp/MusicAppDriver.class
	src/musicApp/Instrument.java