modified:   app/controllers/users_controller.rb
	modified:   app/models/user.rb