upload
merge master
CNAME file