Feature/search (closes #14)

Merged Michelle Weidling requested to merge feature/search-#13-#14 into develop

Merge request reports