수정
Merge branch 'master' of https://github.com/seonggwang/scaling-octo-spice

Conflicts:
	check.txt