Working echo filter w/ on anf off button
Resolved merge conflict
Merge branch 'master' of github.com:tjclement/school-assignments-multimedia
Fixed erroneous merge