none
Merge branch 'master' into gh-pages
fixed links
added CNAME