Update CNAME
update README
Merge branch 'master' into gh-pages