Finish user edit, update, index, and destroy actions
Get back up to date
Resync with Heroku
Finish user edit, update, index, and destroy action
Merge branch 'updating-users'
foo