added index.html
reading from index.html
amend
merge conflict
bugfixing