naoshita!!!!!
marge

Merge branch 'master' of https://github.com/hatakeyama-takeshi/stady

Conflicts:
	README.md