Merge branch 'gh-pages'
fixing typo
updating the slideshow image
Merge branch 'master' into gh-pages