branch learn
AND simple
& simple
conflict fixed
add merge
merge with no-ff
add two files
fix bug 101
add anananan
merged bug fix 101