modify by newsec
Merge branch 'newsec' into new-branch
modify by new-branch
deleted 3.txt
readme.txt modify - branch1
readme.txt modify - branch2
correct by branch2
branch1 - modified
modify changes in branch1
modify changes in branch2
modified by master