resolved merge conflict
added notes, completed coding
Merge branch 'r2_index'