Edit index.html
Merge branch 'edit_html'