also work
Merge branch 'master' of github.com:edomaru/example

Conflicts:
	readme.txt