commit my feature work
this my hot fix
this is a new feature
Merge branch 'newFeature'

Conflicts:
	README.md