branch test
add gitskills
AND simple
& simple
comflict fixed
add merge
merge with no--ff
fix bug 101
merged bug fix 101
com