Update index.html
Update index.html
resolve conflict
Remove asset to fix conflict
Merge branch 'master' into gh-pages
Add CNAME
Resolved conflicts
Add index.html