Add file 8 on branch test1
Merge branch 'jim/test1'

Conflicts:
	file8