Merge branch 'master' into gh-pages
Add cname file
Merge branch 'gh-pages'