참여자·당첨자 통계
Merge branch 'master' of https://github.com/jihoonLee/cqds
기본 상품 입력
Merge branch 'master' of https://github.com/jihoonLee/cqds

Conflicts:
	app/views/page_tab/index.html.erb
fix js bug
Hero 객체 문제 수정
Merge branch 'master' of https://github.com/jihoonLee/cqds

Conflicts:
	app/views/m/index.html.erb
Merge branch 'master' of https://github.com/jihoonLee/cqds

Conflicts:
	app/views/m/index.html.erb
viewport 조정
X
mobile
mobile3