Merge pull request #8 from crotten/master

Converted the routes to ng from ruby
Merge pull request #10 from crotten/master

Fixed merge conflicts
fixed merge conflicts
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
e
Merge pull request #11 from rarice4/master

e
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
helping the peeps