Merge pull request #12 from crotten/master

Updating it to the most recent version
Merge pull request #13 from crotten/master

removed an extra ng-view
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
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