Merge pull request #8 from HappySpinster/master

Master
update cname
Merge branch 'master' into gh-pages