//되는건가??
Merge remote-tracking branch 'origin/bonobono' into fox
???
Merge remote-tracking branch 'origin/master' into fox

Conflicts:
	MovieProject/src/movie/web/controller/MemberController.java
temp삭제
Merge remote-tracking branch 'origin/rabbit' into fox

Conflicts:
	MovieProject/WebContent/BoardList/week_Recommend.jsp
	MovieProject/WebContent/content.jsp
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/detailsMember.jsp
	MovieProject/WebContent/logout.jsp
	MovieProject/WebContent/memberManager.jsp
	MovieProject/WebContent/side-bar.jsp
Merge branch 'fox' of https://github.com/MovieProject/mad-animal.git
into fox

Conflicts:
	MovieProject/WebContent/BoardList/week_Recommend.jsp
	MovieProject/WebContent/content.jsp
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/logout.jsp
	MovieProject/WebContent/memberManager.jsp
	MovieProject/WebContent/side-bar.jsp
	MovieProject/WebContent/writeForm.jsp
초기화중
초기화중
movieController작성중
파일 업로드 준비중
과연 될까나...
movie수정중
movie수정중2
Revert "movie수정중2"

This reverts commit 26d4b38d8627db4685ed4b1cd5035ced1371a7bc.
합체중
합체중2
합체중
리뷰까지 합체
dma?