Finished search function
Merge branch 'master' of http://github.com/maddy-markovitz/NWEN304