Finish part of search
Merge branch 'master' of https://github.com/ulviibrahimov/CMPUT391F