fixed some routes
fixed merge conflicts
Merge pull request #3 from scyclow/routes-models

fixed some routes