conflict
Merge branch 'master' of github.com:wrjeoung/PAPAJHONS

Conflicts:
	src/struts.xml

conflict 수정.