hjh
Merge branch 'mynice-branch'

Conflicts:
	my commit.txt