Merge pull request #17 from arieldiamond/trips_crud

Trips crud
Merge branch 'master' into capybara
edited routes