feature3
switch readme
switch master again
conflict fixed
add merge
merge with no-off
fixed bug 001
merged bug fix 001