user.rb
Merge branch 'master' of github.com:mbuda/RailsGroupProject