Merge branch 'master' into Woonohyo
Mobile Web - Flicking View Implemented
mobile web
Merge branch 'april'

Conflicts:
	src/main/webapp/create.jsp
	src/main/webapp/main.jsp
	src/main/webapp/result.jsp
	src/main/webapp/script/result.js
	src/main/webapp/style/create.css
	src/main/webapp/style/result.css
m_choi folder added
Merge branch 'master' of https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git
bbs test deleted
bbs test deleted
Merge branch 'master' of
https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Servlet mapping changed
typo removed
main 오류 수
완성된 디비 user 테이블에 데이터 입력
local initial commit
initial something
something commit
로그인 실제 디비에 연결
merge 후 깨짐 수정
Merge branch 'woonohyo'
create deleted