Added completer for search
Fixed conflict
Merge branch 'master' of https://github.com/VLN-H7/Skil3