styles the timeline
adds remove timeline features
fixes merge conflict
Merge pull request #27 from rphuber/master

styles the timeline