Added video looping.
Fixed merge conflicts.