sixth commt from  master
seventh commit from test feature
Merge branch 'testfeature'

Conflicts:
	README.md