changed new.txt
resolved merge conflict
added notes, completed
Merge branch 'r2_new'