Committed to feature2.
Edits.
Another commit.
Merge branch 'feature1'

Conflicts:
	TestFile1