Change index.txt
resolve merge conflict
added notes, completed codding