add merge
merge with no-ff
add hello.py
bug fixed for readme.txt
merged bug fix 101
modify hello.py after recover from stash
merged with dev with hello.py added