added trip model
Merge branch 'master' into gene