Merge branch 'master' of https://github.com/onesup/bday_june
CSS 수
Merge branch 'master' of https://github.com/minivertising/bday_june

Conflicts:
	app/views/pc/home/index.html.erb