r3
Merge branch 'newFeature'

Conflicts:
	master.txt