changes to master
Merge branch 'new_branch'

Conflicts:
	test_file
more changes in branch
Merge branch 'new_branch'

Conflicts:
	test_file
added more lines
Merge branch 'new_branch'
added new file 3
new line added from branch
this is branch file