did another thing
Merge branch 'newbranch'

Conflicts:
	text.txt