updated index.html in master workspace
resolve merge conflict master into r2_index
finished feature on r2_index
pulled master from github