카테고리 DB 호출 수정
Merge branch 'master' of https://github.com/bdult/storyfarm

Conflicts:
	src/main/java/com/bgg/storyfarm/controller/ViewController.java
	src/main/webapp/WEB-INF/views/view/play.jsp