Merge branch 'master', remote branch 'origin/master'
Merge branch 'master', remote branch 'origin/master'
Finish user edit, update, index, and destroy actions