CNAME set to live site -- fixed
Merge branch 'catalog' into gh-pages

Conflicts:
	CNAME