routes and models
Merge pull request #2 from bamiano/master

routes and models