everything
modified index.html
Merged conflicts