Update README.md
fix typo in boilerplate
Merge branch 'master' into gh-pages