json formatting
Merge pull request #14 from rarice4/master

json formatting
changed routes
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
fixed route
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
users controller
Merge pull request #15 from rarice4/master

users controller
working on user controller
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
fixins
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
Merge pull request #16 from crotten/master

working on user controller
yet another merge conflict