add merge
merge with no-ff
dev
merge with no-ff
dev
master
master
fix bug 101
merged bug fix 101
README.md
master
add feature vulcan.py