Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:ucsf-ckm/ucsf-history-website into gh-pages