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

Conflicts:
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/notice.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
회원관리 작성 중
css수정 memberController 90% 구현
Merge pull request #30 from MovieProject/fox

Fox
MemberController 완성
MemberController 완성
Merge branch 'fox' of https://github.com/MovieProject/mad-animal.git
into fox
Merge pull request #31 from MovieProject/fox

Fox
Merge pull request #31 from MovieProject/fox

Fox
Merge branch 'master' of https://github.com/MovieProject/mad-animal.git
Merge remote-tracking branch 'origin/master' into bonobono