z
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