testing new branch
just added a hotfix
added stuff in the other branch
Merge branch 'master' into new_branch

Conflicts:
	helloworld.txt