Merge branch 'master' into gh-pages
changing breakpoints
change px breakpoint to orientation. testing
Merge branch 'gh-pages'