background수정
이미지 수
Merge branch 'master' of https://github.com/onesup/big_coupon
이미지수
Merge branch 'master' of https://github.com/minivertising/big_coupon

Conflicts:
	app/views/layouts/application.html.erb
	app/views/pc/home/_popup_personal.erb