testing video
Merge branch 'candycane'
removed file carousel.js