Update, see description

- combining searchEngine method
Merge branch 'master' of https://github.com/Cmput291Fa14TeamNYC/Project1