Added on branch test3
Merge branch 'jim/test3'

Conflicts:
	file8