Merge pull request #6 from MovieProject/kitten

Merge pull request #3 from MovieProject/master
Merge pull request #7 from MovieProject/master

sdf
Merge pull request #8 from MovieProject/puppy

Merge pull request #7 from MovieProject/master
web.xml수정
Merge pull request #9 from MovieProject/master

web.xml수정
Merge remote-tracking branch 'origin/kitten' into chick
ok
Merge branch 'master' into chick
Merge branch 'chick' of https://github.com/MovieProject/mad-animal.git into chick
Merge remote-tracking branch 'origin/kitten' into chick
Merge remote-tracking branch 'origin/kitten' into chick
database관련 자료 및 memberDaoImpl구현준비
context.xml 설정

MemberDao interface수정
Merge remote-tracking branch 'origin/chick' into kitten

Conflicts:
	MovieProject/src/movie/business/service/MemberDao.java