Deleted CNAME
Merge branch 'master' into gh-pages
ADDED CNAME AGAIN LOL