first commit
conflict is fixed
Merge branch 'master' of https://github.com/matcho3/HIKERS
Merge branch 'master' of https://github.com/matcho3/HIKERS
Merge pull request #5 from matcho3/seearch

made search function again
Merge branch 'master' of https://github.com/matcho3/HIKERS
made search function again
drivers'table changed
Merge pull request #6 from matcho3/drivers

drivers'table changed
changed schema