delete trash; update readme.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt

	modify readme.txt