first commit
added index html
resolved conflict