new Feature
Merge branch 'newFeature'

Conflicts:
	r1.txt
master->new Feature