banch test
branch test
commit readme.txt and  gitskills
AND simple
&simple
conflic fixed
add merge
merge with no-ff