Merge remote-tracking branch 'origin/fox'
Merge remote-tracking branch 'origin/fox'
Filter Class 구현
MemberController구현 중
Merge remote-tracking branch 'origin/bonobono' into fox

Conflicts:
	MovieProject/src/movie/web/controller/MemberController.java
ReviewController 생성
member 및  movie수정
??
오타수정
오타수정
MemberController login logout 작성완료
web.xml및 context.xml수정
Merge remote-tracking branch 'origin/fox' into bonobono

Conflicts:
	MovieProject/WebContent/META-INF/context.xml
	MovieProject/WebContent/WEB-INF/web.xml
오타수정
Merge remote-tracking branch 'origin/rabbit' into fox

Conflicts:
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/login.jsp
	MovieProject/WebContent/logout.jsp
내꺼 뭔가 이상해
09.30 PM 04:33
회원관리 페이지 memberManager.jsp / detailsMember.jsp 작성
MemberController 회원가입 및 회원정보수정 가능

registerMember.jsp 수정

updateMember.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