feature 4 on branch feature4
feature 4.1
Merge branch 'feature4'

Conflicts:
	README