Finished basic search
Merge branch 'master' of https://github.com/adairdavid/SENG403G1