edits to show and stuff
merge conflicts take two
Merge branch 'master' of github.com:sarony/flatironvideo
logo font change. colors and buttons on index changed
overlay color and hover fixed
hover on nav bar
buttons on index width fixed
working on timeline width