Merge branch 'gh-pages'
fix final slider ppal
Merge branch 'master' into gh-pages