Complete the Unit 8 tasks
Edit page
Merge branch 'master' into updating-users
Finish user, edit, update, index, and destroy actions