Finished Filters
Merge branch 'master' of https://github.com/pzhao1/CS97FinalProject
Fixed some code