created User model
updated application.rb for heroku
changed devise.rb
view diff resolution