Merge branch 'master' into gh-pages
cname file added
baseurl unset
Merge branch 'gh-pages'