search by city
resolution des conflits
Merge pull request #15 from MaxMck/home-and-search

search by city