Merge pull request #1 from alexperezpaya/master

Master
Update CNAME
Rename main.html to index.html
Update CNAME
Update CNAME
Merge pull request #2 from Rivendoe/gh-pages

A