Merge remote-tracking branch 'origin/fox'
커밋
성인이가 시켬
오타수정
Merge remote-tracking branch 'origin/rabbit' into fox

Conflicts:
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/login.jsp
	MovieProject/WebContent/logout.jsp
MemberController 회원가입 및 회원정보수정 가능

registerMember.jsp 수정

updateMember.jsp 수정
Merge remote-tracking branch 'origin/fox' into bonobono

Conflicts:
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/notice.jsp