add merge
merge with no-ff

Conflicts:
	readme.txt
fix bug 101
merged bug fix 101
ddd