Lots of messing around with sound
Merge branch 'master' of github.com:zeromeaner/zeromeaner

Conflicts:
	zeromeaner-core/src/main/java/org/zeromeaner/util/MusicList.java