Update cname
Resolve conflict

Conflicts:
	CNAME
Center headers