Added CNAME file
Finish cname
Merge branch 'develop'