test r3 ad r6 r7
add \n to system.out.println
Merge branch 'master' into r3
merge.txt