2012104139_양지현_etc commit