Merge pull request #210 from ChrisGrant/master

Finished the search bar implementation.