Proper list of users
working with trash
Merge branch 'master' into users-and-colours

* master:
  add reset action status when click edit, formatting
Merge pull request #6 from stevebrowndotco/users-and-colours

Users and colours