local addtion to create a conflict
Merge branch 'master' of https://github.com/sverweij/testington

Conflicts:
	anotherfile.txt