fix timeline
Merge branch 'master' of github.com:josegonzalez/music-tour
derp