updated website
committing and merging again
new index.html