Finished users
Merge pull request #1 from andter/users

Finished users