adding index.html
changing readme
fixing merge conflict in readme