Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:ucsf-ckm/ucsf-history-website into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:ucsf-ckm/ucsf-history-website into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #1 from Trott/contact-and-2000

reindent for structural clarity, rm extra div closing tags
restore CNAME
restore CNAME
Merge pull request #2 from Trott/contact-and-2000

Contact and 2000
Merge pull request #25 from lkleinberg/master

contact form link and 2000.html
Merge branch 'gh-pages' of github.com:ucsf-ckm/ucsf-history-website into gh-pages
Merge branch 'gh-pages'
Removed a bunch of items from 2000 page per Polina.
Merge pull request #26 from lkleinberg/master

Removed a bunch of items from 2000 page per Polina.
Changes to Evans page and addition of K. Bishop page.

NOTE: Things look broken in my Dreamweaver preview, but it might just
be the way this site is built? Hoping the extra code I’m seeing is not
visible on live pages (e.g. {% include search_include.html %}.) Also,
placeholder images will be swapped once real one is approved.
Merge pull request #27 from mizejewski/Bishop-edits

Changes to Evans page and addition of K. Bishop page.