Merge feature-timer into danasilver/gh-pages.