수정
Merge branch 'master' of git@github.com:y30435/ganzi.git
Merge branch 'master' of git@github.com:y30435/ganzi.git
컨트롤러 수정