branch test
AND simple
& simple
conflict fixed
Add merge
merge with no-ff
fix bug 101
merged bug fix 101
dev with hello.py but no a
add hello.py to master
without dev
delete hello.py