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

working on user controller