edit readme
Merge branch 'master' of github.com:fehmi/test

Conflicts:
	readme.txt