Finished sign in
Sign In and Update
Finish user edit, update, index, and destroy actions
Fixed conflicts