deleted video files.
resolved merge conflicts
added playlist code.