test: Added file 8 in branch 4
test: edit file 8
Merge branch 'master' into jim/test4
edit to file 8 on branch test4
Another edit to file 8 on branch test 4
Merge branch 'jim/test4'

Conflicts:
	file8