refactoring
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/ahcurrier/blak-ui into gh-pages