removed CNAME
added CNAME to .gitignore
Merge branch 'gh-pages'
added baseurl to links to work on gh-pages
Merge branch 'master' into gh-pages