Merge pull request #14 from rarice4/master

json formatting
users controller