Phil added a comment
Merge branch 'master' of https://github.com/woodbury/Musha into adamDev

Conflicts:
	bin/music/MushaManager.class
	src/music/MushaManager.java