readme.txt in dev
merge with no-ff
pragram.txt in fu1
fix bug_101
fixed bug_101