change index.html
resolve merge conflict
added notes completed
change index.html
Merge branch 'r2_index'