Merge branch 'gh-pages'
fixed typo thing