update
수정
Merge branch 'master' of github.com:parkeunjung/Team-Project

Conflicts:
	MOVIEHOLIC/WebContent/awardEdit/awardWrite.jsp
	MOVIEHOLIC/WebContent/directorEdit/directorUpdate.jsp
	MOVIEHOLIC/create_awards.sql