the search button will not overlap
Merge branch 'master' of https://github.com/jbernie2/csc210final
green success bar implemented
Merge branch 'john'
Merge branch 'Joseph'
added file