conflict resolved
ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/secondTask/Filter.java
	src/secondTask/MainWindow.java
	src/secondTask/RealTimePlayer.java