created search and results page to view the 10 closest coffeeshops based on the zip code entered
fixed merge conflict