공지사항 완성.
Merge branch 'master' of https://github.com/HeoSeokMu/KH

Conflicts:
	build/classes/dao/MemberDAO.class
	src/dao/MemberDAO.java
에러 처리