커밋
0930_11_05
합성 완료
Merge branch 'mutton' of https://github.com/MovieProject/mad-animal.git
into mutton

Conflicts:
	MovieProject/WebContent/login.jsp
	MovieProject/WebContent/logout.jsp
	MovieProject/WebContent/registerMember.jsp
	MovieProject/WebContent/top.jsp