Update CNAME
fix emails
Merge branch 'gh-pages'