edit readme too
Merge branch 'master' of https://github.com/zephyrzoom/test

Conflicts:
	README.txt
edit readme