Merge branch 'gh-pages'
remove guide borders from css and hide hadouken
Merge branch 'master' into gh-pages