Create index.html
Add CNAME
Add cal
fix error in merging