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
fixed outdated link to contact form
Merge branch 'master' of https://github.com/ucsf-ckm/ucsf-history-website
Removed 'David Vlahov appointed Dean of SON' from timeline (2011) -- and I think I solved the problem with the <div> tags but not sure. Let's take a look at how this looks before I make more changes to this page.
reindent for structural clarity, rm extra div closing tags
rm CNAME for testing
hey, let's fix the formatting
Merge branch 'contact-and-2000' into gh-pages
srsly fix it
Merge pull request #1 from Trott/contact-and-2000

reindent for structural clarity, rm extra div closing tags
restore CNAME
restore CNAME