Implemented Search Function
Merge branch 'Emma' into Patrick
Fixed relationships