changing to user_name
Merge branch 'master' of github.com:chrrrles/digital_tip_jar