add merge
merge with no-ff
fix bug 101
merged bug fix 101
add hello.c
merged dev
add notes
add notes
merged dev 20141125