changed to bentley
Merge branch 'joe'

Conflicts:
	file-a.txt