Log Update Test
Merge branch 'Chris'

Conflicts:
	LOG