통계
Merge branch 'master' of http://github.com/onesup/bday_june

Conflicts:
	app/models/user.rb