first commit
conflict is fixed
Merge branch 'master' of https://github.com/matcho3/HIKERS
Merge branch 'master' of https://github.com/matcho3/HIKERS
Merge branch 'master' of https://github.com/matcho3/HIKERS
made search function again