cname
Update CNAME

cname
initial my blog
my CNAME
delete
Merge branch 'master' into oldmaster

Conflicts:
	.gitignore