Merge branch 'master' into gh-pages
changed html
Merge branch 'gh-pages'