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

Conflicts:
	src/firstTask/WavFileGenerator.java