added anchor tags from markers to notes
added js comments
resolved merge conflicts, got the progress bar working
changes made to video.css file