the search button will not overlap
Merge branch 'master' of https://github.com/jbernie2/csc210final