modelname.sql 수정
Merge branch 'master' of https://github.com/jesuskim16/project_pam.git

Conflicts:
	WebContent/modelname.sql