ffs
Merge branch 'master' of github.com:ednapiranha/parallax
Merge branch 'master' of github.com:meatspaces/parallax