timeline moves
Merge branch 'master' of https://github.com/jtsanch/music_app