this is yet another test edit for github conflict
Merge branch 'master' of https://github.com/mrm-dev1/jparallax