Adding new file
Adding some new things to newfile
Adding new file
Remove new file
Trying to adding new file #1
Modify newfile #1
Adding new things to newfile #2
Merge branch 'master' into newfile

Conflicts:
	newfile
Adding new line for #dev
Adding for #dev
Some fix for the master
Merge branch 'dev'

Conflicts:
	newfile