More fixings
Working on spectrum shower
Spectrumz
Merge branch 'master' of https://github.com/realcore/demo

Conflicts:
	src/no/demo/DemoMain.java
	src/no/demo/MuzakAnalyser.java