add hello
merge with no-ff
fix bug 101
merge bug fix 101
add hello
Merge branch 'dev'