added latitude and longitude functionality

updated the call to weather underground to use latitude and longitude
returned from #cityState search box
fixed merge conflict

I hope