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
adjusted todo notes
added video name + description to controlbar skin
Merge branch 'master' of github.com:sarony/flatironvideo
added padding to instructor buttons
login button added and styled on signup page
footer
padding on signin/signup, added footer
precompiled production assets for heroku