changing readme
Merge branch 'testing'

Conflicts:
	readme.txt