Added new file on feat1 branch
Added a new file to master branch
Merge branch 'feat1'

Conflicts:
	branch_test.txt
Added new file on feat1 branch
Deleted test file