branch test
feature1
feature0
Merge branch 'feature1' into b1

Conflicts:
	readme.txt
conflict fixed
merge