kimjuhyun added
Merge branch 'master' of https://github.com/ewooschool/PDong-exercise

Conflicts:
	test.txt
test2

Conflicts:
	test.txt