branch test
AND simpile
& simple
conflict fixed
unuse fast_forward
merge with no-ff
fix bug 101
test --no-ff
add vulcan.c
Merge branch 'dev'