First page commit
second testing
test cname
add my website
add my website
edit cname to include both domains
edit cname to only include www
Merge branch 'master' into gh-pages