Add readme.txt
add t.txt
modified t.txt
readme changed thridth
second modification
Add a dir and mv t.txt
branch dev modify readme
branch master modify readme
conflict fixed
add new content
Merge remote-tracking branch 'origin/master'