fixes merge conflict.
fixes the issue where the timeline doesn't show up after a user saves the first drawing for a website.
fixes timeline appearing when 2 drawings are present for a url and also the 'too many notches' on the timeline bug
Merge pull request #24 from vertigokidd/show_timeline

fixes timeline appearing when 2 drawings are present for a url and also the 'too many notches' on the timeline bug