Add in timeline
Merge remote-tracking branch 'origin/master' into vik/timeline-front
Merge pull request #8 from ChillOutHack/vik/timeline-front

Vik/timeline front