Merge pull request #2 from cmhughes/master

mickey
started work on timeline- need to complete it, will return after class