sets the timelineService to control the timeline data
reverts sass back to normal
fixes merge conflict
Merge pull request #25 from rphuber/master

See commit notes