branch test
add simple
& simple
conflict fixed
fix bug 101
merged bug fix 101
add test.txt
merge dev
add feature vulcan
Merge branch 'dev'