updated update
adding params to update
updated accounts controller and routes.rb
resolving merge conflicts
fixing merge conflicts