branch test
add simple
& simple
confict fixed
add merge
merge with no-ff
add files gitskills
fix bug 101
fix bug 101
merge bug fix 101