1.1, 1.2 내용 입력
Merge branch 'jdh' into zzongaly

Conflicts:
	(?뼇?떇)KAIST_?쇅二쇨컻諛쒓퀎?쉷?꽌(?젣?븞?꽌).doc