Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merge
added 2 new classes
Merge pull request #7 from connerv/master

TimelineRender  v1