commit
Merge branch 'master' of https://github.com/nenokido2000/myrepo

Conflicts:
	readme.txt