Title for commit

The rest
Test

rest
Merge branch 'm2'

Conflicts:
	exampleFile.txt

Meld used

worked well