Search Functionality
Merge branch 'development' of https://github.com/driskull/hackathon into development