recompile the blog
change the cname
a little change
Merge remote-tracking branch 'origin/master'

Conflicts:
	blog/index.html