add div inside index.html
resolve merge conflict
added notes,completed coding
Merge branch 'team1'