junk line 2 different
Merge branch 'master' of https://github.com/brucespencer/cip

Conflicts:
	junk.txt
junk test line 2