휴가 카운트 수정 중
합치기 중
Merge branch 'master' of https://github.com/HeoSeokMu/KH

Conflicts:
	build/classes/dao/boardDAO.class
	build/classes/dao/bookInsertDAO.class
	build/classes/dao/sugangDAO.class
	build/classes/dto/sugangDTO.class
	build/classes/dto/vacationDTO.class
	build/classes/library/controller/inputNum.class
	build/classes/library/controller/notice.class
	build/classes/library/controller/selectInform.class
	build/classes/member/controller/Login.class
	build/classes/member/controller/RestReturn_board.class
	build/classes/member/controller/memCon.class
Merge branch 'master' of https://github.com/HeoSeokMu/KH
git 에러 수정
Merge branch 'master' of https://github.com/HeoSeokMu/KH

Conflicts:
	WebContent/sugang/sugang.js
	build/classes/dao/sugangDAO.class