searc function added
Merge branch 'collen' of https://github.com/MarkFouche/cos301_2014_g7 into collen