changed small error on Gemfile probably added by diff
changed user.rb a bit