commit 1
KMP 2
local
Merge branch 'master' of https://github.com/k1eran/my-repo

Conflicts:
	foo.txt