Team 1 start working on r2_index brunch
typo
resolved merge conflict
added notes. completed coding
comments on where merge conflicts where in code
Merge branch 'r2_index'
final version of master after merging both teams work