search page and search results page linked
Merge conflicts with edit profile and search"
Merge branch 'master' of github.com:amylynnb3/Scholars--Hackathon

Merge conflict with member linking and search page