butfix
Master index file
resolved conflicts for master and r2_index
finished coding