branch test dev
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101
delete mergwe w
merged bug fix 101 w
add feature vulcan
merge with no-ff vulcan
add hello.py
no-ff merge dev