master index modified
index.html changes from r3
index.html changes after pull
completed merging with master index file