Merge branch 'gh-pages'
change slides.js path
Merge branch 'master' into gh-pages