edit form finished
Merge branch 'master' into updating-users
Finish user edit, update, index, and destroy actions
Add user microposts