adding vimeo
resolved merge conficts