머지를 위한 테스트 수정
Merge branch 'master' of https://github.com/KimHyeonJu/git_practice.git

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/KimHyeonJu/git_practice.git

Conflicts:
	test.txt