test: add file 2
test: added file1 to test2 branch
Merge branch 'jim/test1' into jim/test2

Conflicts:
	file1
Merge branch 'jim/test2'

Conflicts:
	file1
	file1.orig