Merge branch 'gh-pages'
scaled imgs
Merge branch 'master' into gh-pages