changed index.html file
resolve merge conflict
added notes. completed coding