modified README
modified README
modified
Merge branch 'testing'

Conflicts:
	README