a
Merge branch 'master' into updating-users

* master:
  とりあえず
  とりあえず
Finish user edit, update, index, and destroy actions