branch test
AND simple
& simple
Merge branch 'feature1'

Conflicts:
	readme.txt
add merge
merge with no-ff
fix bug 101
merged bug fix 101