trips revised
Merge pull request #13 from matcho3/trip

trips revised