Pages
merge conflicts
Merge branch 'master' into gh-pages
added sets to srcset