some changes
work by a coworker
Merge branch 'trouble'

Conflicts:
	README.md