Merge branch 'master' into gh-pages
Update CNAME
fixing warning
Merge branch 'gh-pages'