Basic filtering implementation
Merge pull request #58 from coreyd303/search

Basic filtering implementation
fix merge conflicts