pull
Merge branch 'master' of https://github.com/matcho3/HIKERS into searchtest
Merge pull request #15 from matcho3/trip

trip revised.
Merge pull request #16 from matcho3/trip

trips have driver_id
changed trip a lil
completed searchtest and made book function a bit
fixed
Merge pull request #17 from matcho3/searchtest

Searchtest
conflict is fixed