search in progress
Merge branch 'master' of https://github.com/alexandrayorke/FinalCS147Project
search bar done
Merge branch 'master' of https://github.com/alexandrayorke/FinalCS147Project