Added parallax
Merge branch 'parallaxTests'