Merge pull request #67 from cca-team3-webproject/master

그지
상품 효과
Merge branch 'goodbye' of
https://github.com/cca-team3-webproject/rep-sakdagu.git into goodbye

Conflicts:
	sakdagu/WebContent/WEB-INF/views/board/imageList.jsp
	sakdagu/WebContent/css/body.css
Merge pull request #69 from cca-team3-webproject/goodbye

Goodbye