change readme 1
and simple
& simple
conflict fixed
in dev
merge with no-ff
fix bug 101
merged bug fix 101
fix ok and continue my job.
add gitignore