Implemented search
Merge pull request #1 from FalkoJoseph/fj-feature-search

Implemented search