branch test
AND simple
& simple
and simple
dev
merge with no-ff
fix bug 101
merged bug fix 101
test dev
merge commit
add feature vulcan
merge vulcan
merge dev