???
합체중
합체중2
합체중
리뷰까지 합체
우와왕~~~~~~~~~~~~앙
Merge remote-tracking branch 'origin/master' into bonobono

Conflicts:
	MovieProject/WebContent/BoardList/newMovieIntro.jsp
	MovieProject/WebContent/BoardList/week_Recommend.jsp
	MovieProject/WebContent/WEB-INF/views/movie/newMovieIntro.jsp
	MovieProject/WebContent/WEB-INF/views/movie/readMovie.jsp
	MovieProject/WebContent/WEB-INF/views/movie/updateMovieForm.jsp
	MovieProject/WebContent/WEB-INF/views/movie/week_Recommend.jsp
	MovieProject/WebContent/WEB-INF/views/movie/writeMovieForm.jsp
	MovieProject/WebContent/WEB-INF/views/review/review.jsp
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/content.jsp
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/css/movie.css
	MovieProject/WebContent/dropOut.jsp
	MovieProject/WebContent/js/board.js
	MovieProject/WebContent/review.jsp
	MovieProject/src/movie/business/service/ReviewServiceImpl.java
	MovieProject/src/movie/web/controller/MovieController.java
	MovieProject/src/movie/web/controller/ReviewController.java