CNAME
Merge branch 'master' into gh-pages

Conflicts:
	CNAME
CNAME
Merge branch 'master' into gh-pages
CNAME
Merge branch 'master' into gh-pages