barely anything changed
fixed conflict
ajax works
minor changes to video_1.js file
Merge branch 'master' of github.com:sarony/flatironvideo
Merge branch 'master' of github.com:sarony/flatironvideo
Merge branch 'master' of github.com:sarony/flatironvideo
Merge branch 'master' of github.com:sarony/flatironvideo
Merge branch 'master' of github.com:sarony/flatironvideo
not sure
canvas coordinates