승현이가 커밋하라고함
09.30 PM 04:33
회원관리 페이지 memberManager.jsp / detailsMember.jsp 작성
Merge remote-tracking branch 'origin/fox' into rabbit

Conflicts:
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/side-bar.jsp
Merge remote-tracking branch 'origin/rabbit' into fox