show date on timeline
merge conflict
Merge pull request #58 from kaitlinhuben/eh-timeline

date on timeline