picking mergetools
merge fixed?
Merge branch 'master' of https://github.com/blackdoor/testRepo

Conflicts:
	programfile.program