#4: Beccie & Amber: added search by name & number functionality
#4: Beccie & Amber: fixing merge conflicts
#4: Beccie & Amber: fixing merge conflicts