Adding file to test branching
changes on developer 1 branch
devel 1 branch change #2
developer 2 branch change
Merge branch 'developer2_dev'

Conflicts:
	branch_test.txt