api test are all green
all tests green, except one, but it is looking for an index page that is not on this branch, but the page is on master, so once it is merged it should be green all across the board
tests green, except for the index controller methods on users and trips, but those should be green when merged to master
Merge branch 'unit-test'
all test green