changed index1.html
merged index.html
this is a merge commit made