testing mergetool on bruce's machine
Merge branch 'master' of https://github.com/brucespencer/cip

Conflicts:
	junk.txt
added junk with different line 2