Merge branch 'master' into gh-pages
removed CNAME
added CNAME to .gitignore
added baseurl
added baseurl, removed analytics
Merge branch 'gh-pages'