Rename var dummy1 to dasom from Normal
충돌 수정 from Normal

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/servlet/SearchServlet.java
"<<HEAD" 삭제 from Normal