Merge branch 'gh-pages'
auto format button on resize
Merge branch 'master' into gh-pages