made a change to readme
made other changes
Merge branch 'testing'

Conflicts:
	README