completed basic search functionality for files and folders
implemented all suggested changes as per first pull request
search function complete
Merge branch 'search_func' into dev