branch test
create branch
add simole
& simple
conflict fixed
fix bug 101
merged bug fix 101
doing a working
add a new work