Merge branch 'teaching_at_uc_davis' of github.com:abostroem/site into teaching_at_uc_davis
Minor edits
Merging Greg's PR into my updated version
spelling out numbers
Merge branch 'gvwilson-teaching_at_uc_davis' into teaching_at_uc_davis