Added map to zipcode show page
removing database.yml file
resolvd conflicts after merging maps