Website
Cname added
Updates to text
merge conflicts fixed