Merging conflicts in sign in and sign up pages
Merge branch 'master' of https://github.com/juliatan/racefinder