commiting new_branch
new line on master branch
Merge branch 'new_branch'

Conflicts:
	luke_practice.txt