added users cvm
User CRUD working
fixed user & master merge conflict
Merge pull request #4 from lizrush/users

Users