Merge branch 'finish' into gh-pages
fix spell
Merge branch 'gh-pages' into finish