prallax and carousel
Merge branch 'refactor'