start working on scroll logic for top videos
remove old js code
fix merge conflicts
More minor improvements
Fix merge
Update gemfile lock
Merge branch 'bug_fix' into development
main layout complete
fix form controller bug
Merge branch 'development' of github.com:alyraz/media_map into development
layout complete
fix merge conflicts
prelim url
Merge branch 'development' into archive-link
Merge branch 'development' of github.com:alyraz/media_map into development
make player large enough to display vevo videos
fix conflict
fix display error
fix conflict
fix vevo display error