git is working again
Merge branch 'master' of https://github.com/BASES-Stanford/bases_website