can i commit?
Merge branch 'master' of https://github.com/tomoueda/r.o.y

Conflicts:
	README