Changed range of latest 2 nav timelines
Merge branch 'master' into nav-update

Conflicts:
	images/titles/1990.jpg
move nav to include file
Merge pull request #1 from Trott/nav-update

Update from master
add missing file
Merge pull request #2 from Trott/nav-update

add missing file
Merge pull request #35 from mizejewski/nav-changes-to-extend-timeline-and-content-re-shuffle

Nav changes to extend timeline and content re shuffle
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:ucsf-ckm/ucsf-history-website into gh-pages