add python datastyle
add feature vulcan
branch test two
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101