Merge branch 'hotfix/1.1.2' into develop
Merge branch 'hotfix/1.1.3' into develop
Merge branch 'develop' of github.com:GumbyFramework/Parallax into develop
Merge branch 'hotfix/1.1.4' into develop
Merge branch 'hotfix/1.1.5' into develop
Added index.html to gitignore
Check for x background position and use if present, default to 50%
Merge branch 'feature/xposition' into develop
Bumped Bower version number
Merge branch 'release/1.2.0'