adding file on master
master revision
revision on master
revision on branch
changes
Merge branch 'master' into developer2_dev

Conflicts:
	branch_test.txt