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

Conflicts:
	src/secondTask/Filter.java
Merge branch 'master' of https://github.com/Adam140/SoundProcessing
Merge branch 'master' of https://github.com/Adam140/SoundProcessing
Mel