init
added cname file
merged master