add readme txt content
insert a txt in first branch
modify so easy
modify so easy absolutly
fix conflicts
add a.txt
merge with no-ff
fix a bug 1
Merge branch 'dev'
fix conflicts on statsh