played around with timeline length
pulled in sarons latest changes
fixed merge conflict
Merge branch 'master' of github.com:sarony/flatironvideo
testing js for adding data to control bar
Merge branch 'master' of github.com:sarony/flatironvideo
added video name + description to controlbar skin