Merge branch 'william_dev'

Conflicts:
	top file_improved.txt