trip changed
conflict is fixed
Merge pull request #18 from matcho3/trip

Trip