Merge branch 'gh-pages'
Change image sizing
Merge branch 'master' into gh-pages