Search Criteria

FIXED all Jacob's failures
Merge branch 'master' of https://github.com/jskracht/Project-3110