add something..
simple
&
fixed
add dev branch
merge with no-ff
101
merged bug 101