modified by newBranch
modified by master
deleted Test3.java
new file by newBranch
removed by newBranch
add by master
Merge branch 'master' into newBranch
modified by newBranch
modified by master
modified by testingBranch
modified by master