fixed merge conflict, deleted old search bar with filter, need to add search bar functionality to homepage search bar
fixed merge conflict, deleted old search bar with filter, need to add search bar functionality to homepage search bar

yandrew/DBC-Final-Project-Frontend,yandrew/DBC-Final-Project-Frontend