15 and 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	RbTest1Prj1/src/kr/co/robin1/TestDataClass1.java