the search button will not overlap
Merge branch 'master' of https://github.com/jbernie2/csc210final
Merge branch 'john'
changed the registration page
Merge branch 'Joseph'
added file
added name to top of page