commit_자원봉사 신청내역 페이지 작성중
Merge branch 'master' of https://github.com/hukla/gaenari/
commit
Conflicts:
	WebContent/WEB-INF/actionMapping.properties
commit