Merge pull request #199 from evansb/stable

Pre-Demo
Implement various filters
Merge branch 'master' of https://github.com/cs2103aug2014-w10-1c/main into stable