Some changes
Work by a colleague
Merge branch 'trouble'

Conflicts:
	README.md