Updated style guide to pixels only
Updated styles to pixels
Merge branch 'master' into gh-pages
Updated gh-pages