Added feature 2
Completed feature 2
Merge branch 'feature2_new'

Conflicts:
	file1.txt