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
able to plot points on canvas bar
img tags now appears on canvas timeline in html
not sure
canvas coordinates
bound canvas and mouse coordinates work
ticker in divs works. canvas deleted
resolved merge conflicts