spectrum
Merge branch 'master' of https://github.com/Adam140/SoundProcessing

Conflicts:
	src/firstTask/Diagram.java