puts 삭제
Merge branch 'master' of https://github.com/onsaemiro8318/big_coupon

Conflicts:
	app/models/user.rb