featured branch commit
Merge branch 'featured1'

Conflicts:
	myfile2.txt