Adding content to newfile1 from the test1 branch
Removing the rouge files created and adding content to newfile1
Another line from test1 branch
Third line addition to master's newfile1
Merge branch 'master' into test1

Conflicts:
	newfile1
cleaned up newfile1
Adding the hello newfile1 line
Adding another line to another file
OK. We need to add a comment by force. I get it.