Merge branch 'master' into gh-pages
changed /blog to /showcase, added CNAME
Merge branch 'gh-pages'