Added map in restaurants
map page edits
Fixed merge conflicts
map css for res page