Merge branch 'WEEK12'
Merge branch 'WEEK13' of
https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git into editpreview
Merge branch 'WEEK13' of https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git into editpreview
add bgi in count view
edit css, header
edit preview js and css
edit
미리보기 창 맨 위에 띄우기
refactoring preview
add result page
a
test commit
Merge branch 'master' of
https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git

Conflicts:
	src/main/webapp/create.jsp
	src/main/webapp/src/css/create/photo.css