Feature 1 branch commit
ture changes master.txt
Merge branch 'feature'

Conflicts:
	master.txt