change in readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt
change in readme