merged user.rb and README