-- feature 1 added
-- feature 2
more changes
Merge branch 'feature1'

Conflicts:
	sample.txt