改心しました！
Merge branch 'master' of github-uetchy:uetchy/temp_hero

Conflicts:
	README.md