huehuehue
Merge branch 'master' of https://github.com/shirai-kenta/study

Conflicts:
	study0710