feature 2
feature 3
Merge branch 'newFeature1'

Conflicts:
	test.txt