add a readme
and simple in readme
& simple in readme
merge
add merge
merge with no-ff
fix bug 101
merge fix bug 101
add all
merge the dev branch

Conflicts:
	README.md
add files