Finish user edit, update, index, and destroy actions
Merge branch 'updating-users'

Conflicts:
	.idea/workspace.xml