Merge branch 'gh-pages'
reworking hero images
Merge branch 'master' into gh-pages