find result update
Merge branch 'master' of https://github.com/bdult/storyfarm into Unho
jpg size update
Merge branch 'Unho'
Merge branch 'jisoon'

Conflicts:
	src/main/webapp/WEB-INF/views/includes/header.jsp
	src/main/webapp/assets/images/content/hangul_Timg.jpg
	src/main/webapp/assets/images/content/thum.jpg
선택보기 기능 구현