style changes per Dave Bringle's suggestions
Merge branch 'master' of https://github.com/ericwhyne/open-catalog-generator
Office column added to Splash page
rollback on timeline edits
Merge pull request #90 from snordt/master

Added Office column to splash page, timeline edits