Updated styles, added style changer
Merge branch 'master' into gh-pages
Updated gh-pages