adds trips model
Merge pull request #31 from ericfransen/work

Work
fix merge conflicts