configコンフリクト解消
Merge branch 'master' of https://github.com/wakusei-meron-/studyinturn