newfile
foo
Merge branch 'newfeature'

Conflicts:
	newfeature