branch test
and simple
& simple
conflict fixed
add merge
merge weith no-ff
fix bug 101
merged bug fix 101
submit
Merge branch 'master' of https://github.com/thinkMore123/learn