修正
Merge branch 'master' of https://github.com/ginsyama/syukudai

Conflicts:
	README.md