Adding a newfile
Changing again
Changing to merge
Merge branch 'master' into new3

Conflicts:
	newfile2