ok
Merge branch 'manny'

Conflicts:
	README.md