added r2_test
Merge branch 'master' into r2_test
changed gittest.txt
resolve merge conflict on gitte;xt.tx;t
added some changes to r2_test
Merge branch 'r2_test'