added code to search for restaurants based on search term
fixed all the merge issues