_site deleted, ready to deploy
Merge branch 'dev' into gh-pages
Styleguide added