추가 수
이미지 추가 수
Merge branch 'master' of https://github.com/minivertising/bday_ohui

Conflicts:
	app/assets/stylesheets/mobile/home_controller.css.scss
	app/views/mobile/home/index.html.erb