Edited index
Merge branch 'master' into r2_index
resolve merge conflict
added notes complete project
Fixed