from testing3
some change
from master
Merge branch 'master' into testing3
merging
junkcom
changed from testing
add another file
Merge remote-tracking branch 'origin/testing3' into testing2
some changes