commit in dev
fix readme on feather1
fix on master
fix conflict
fast branch
no fast fix
merge with no-ff
add file
commit in master
fix bug
merged bug fix 101