Merge pull request #1 from akaroot/gh-pages

Update CNAME
Merge pull request #2 from akaroot/master

Merge pull request #1 from akaroot/gh-pages